更新前端文件，修复砍价拼团绑定关系

crmeb/public/statics/mp_view/components/Authorize.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/components/orderGoods/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/components/payment/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/components/recommend/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/components/userEvaluation/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/components/activity.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/components/bargain.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/components/combination.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/components/customerService.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/components/mBanner.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/components/menus.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/components/news.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/components/popular.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/components/swiperBg.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/index.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "",
   "navigationStyle": "custom",
   "navigationBarTextStyle": "white",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "goods-waterfall": "/components/goodsWaterfall/goodsWaterfall",
     "coupon-window": "/components/couponWindow/index",

template/uni-app/api/admin.js

@@ -11,3 +11,14 @@
 
 import request from "@/utils/request.js";
 
+/**
+ * 订单核销
+ * @returns {*}
+ */
+export function orderVerific(verify_code, is_confirm) {
+	return request.post("order/order_verific", {
+		verify_code,
+		is_confirm
+	});
+}
+

template/uni-app/api/api.js

@@ -298,7 +298,7 @@ export function getCity() {
 }
 
 /**
- * 获取小程序直播列表
+ * 获取小程序列表
  */
 export function getLiveList(page, limit) {
 	return request.get('wechat/live', {

template/uni-app/components/cus-previewImg/cus-previewImg.vue

@@ -66,6 +66,7 @@
 			},
 			shareFriend(){
 				this.$emit('shareFriend')
+				this.showBox = false;
 			}
 		}
 	}

template/uni-app/components/guide/index.vue

@@ -6,12 +6,10 @@
 					<view class="swiper-item-img">
 						<image :src="item" mode="aspectFit"></image>
 					</view>
-					<!-- <view class="swiper-item-img"><image src="../../static/guide/icon_01.png" mode="aspectFit"></image></view> -->
 				</view>
 			</swiper-item>
 		</swiper>
 		<view class="jump-over" @tap="launchFlag()">跳过 {{time}}</view>
-		<!-- <view class="uniapp-img"><image src="../../static/guide/uniapp4@2x.png" mode="aspectFit"></image></view> -->
 	</view>
 </template>
 
@@ -74,6 +72,7 @@
 		height: 100%;
 		background-size: 100% auto;
 		padding: 0;
+		z-index: 999;
 	}
 
 	.swiper {

template/uni-app/manifest.json

@@ -10,7 +10,7 @@
         "usingComponents" : true,
         "nvueCompiler" : "uni-app",
         "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
+            "alwaysShowBeforeRender" : false,
             "waiting" : false,
             "autoclose" : true,
             "delay" : 0

template/uni-app/pages.json

@@ -13,7 +13,8 @@
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -174,7 +175,7 @@
 		{
 			"path": "pages/live_list/index",
 			"style": {
-				"navigationBarTitleText": "直播列表"
+				"navigationBarTitleText": "精彩内容"
 			}
 		}
 	],
@@ -866,6 +867,24 @@
 				}
 			}
 		},
+		{
+			"root": "pages/admin",
+			"name": "adminOrder",
+			"pages": [{
+				"path": "order_cancellation/index",
+				"style": {
+					"navigationBarTitleText": "订单核销",
+					"app-plus": {
+						// #ifdef APP-PLUS
+						"titleNView": {
+							"type": "default"
+						}
+						// #endif
+					}
+				}
+			}]
+		},
+
 		{
 			"root": "pages/goods_details",
 			"name": "goods_details",

template/uni-app/pages/activity/goods_seckill_details/index.vue

@@ -16,7 +16,6 @@
 		<!-- #ifndef APP-PLUS -->
 		<menuIcon :showMenuIcon="showMenuIcon" @open="open"></menuIcon>
 		<!-- #endif -->
-
 		<view class='product-con'>
 			<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true"
 				:style="'height:'+height+'px;'" @scroll="scroll">
@@ -413,7 +412,6 @@
 
 			if (options.id) {
 				this.id = options.id
-				this.status = options.status
 				//记录推广人uid
 				if (options.pid) app.globalData.spid = options.pid;
 				// if (options.time) this.datatime = Number(options.time);
@@ -490,11 +488,9 @@
 			},
 			getSeckillDetail: function() {
 				let that = this;
-				getSeckillDetail(that.id, {
-					// time: that.datatime,
-					status: that.status
-				}).then(res => {
+				getSeckillDetail(that.id, {}).then(res => {
 					this.dataShow = 1;
+					this.status = res.data.storeInfo.status
 					let title = res.data.storeInfo.title;
 					this.storeInfo = res.data.storeInfo;
 					this.datatime = Number(res.data.storeInfo.last_time);

template/uni-app/pages/guide/index.vue

@@ -21,13 +21,11 @@
 		},
 		onLoad() {
 			this.loadExecution()
-
 		},
 		methods: {
-			loadExecution: function() {
+			loadExecution() {
 				const tagDate = uni.getStorageSync('guideDate') || '',
 					nowDate = new Date().toLocaleDateString();
-				console.log(nowDate)
 				if (tagDate === nowDate) {
 					uni.switchTab({
 						url: '/pages/index/index'
@@ -35,7 +33,7 @@
 					return
 				}
 				getOpenAdv().then(res => {
-					console.log(nowDate)
+					console.log(res)
 					if (!res.data.length) {
 						uni.switchTab({
 							url: '/pages/index/index'

template/uni-app/pages/index/components/alive.vue

@@ -8,7 +8,6 @@
 					<text class="title">{{titleInfo[0].val}}</text>
 					<navigator class="more">查看更多<text class="iconfont icon-jiantou"></text></navigator>
 				</view>
-				<!-- 直播 -->
 				<view class="live-wrapper-a">
 					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index"
 						:url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id"
@@ -24,7 +23,7 @@
 							</view>
 							<view class="label bgred" v-if="item.live_status==101">
 								<text class="iconfont icon-zhibozhong"></text>
-								<text>直播中</text>
+								<text>进行中</text>
 							</view>
 							<image :src="item.share_img"></image>
 						</view>
@@ -65,9 +64,8 @@
 					<text class="title">{{titleInfo[0].val}}</text>
 					<navigator class="more">查看更多<text class="iconfont icon-jiantou"></text></navigator>
 				</view>
-				<!-- 直播 -->
 				<view class="live-wrapper-a">
-					<view class="empty-img">直播间，暂无数据</view>
+					<view class="empty-img">暂无数据</view>
 				</view>
 			</view>
 		</view>
@@ -80,12 +78,11 @@
 						<view class='title line1'>
 							{{titleInfo[0].val}}
 						</view>
-						<view class='line1 txt-btn'>精彩直播</view>
+						<view class='line1 txt-btn'>精彩内容</view>
 					</view>
 					<navigator hover-class="none" url="/pages/live_list/index" class="more">更多<text
 							class="iconfont icon-jiantou"></text></navigator>
 				</view>
-				<!-- 直播 -->
 				<view class="live-wrapper-a">
 					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index"
 						:url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id"
@@ -101,7 +98,7 @@
 							</view>
 							<view class="label bgred" v-if="item.live_status==101">
 								<text class="iconfont icon-zhibozhong"></text>
-								<text>直播中</text>
+								<text>进行中</text>
 							</view>
 							<image :src="item.share_img"></image>
 						</view>
@@ -185,7 +182,6 @@
 		},
 		mounted() {},
 		methods: {
-			// 直播
 			getLiveList: function() {
 				getLiveList(1, this.numConfig <= this.limit ? this.numConfig : this.limit)
 					.then(res => {

template/uni-app/pages/index/index.vue

@@ -259,7 +259,7 @@
 				menus: {}, //导航
 				news: {}, //消息公告
 				activity: {}, //活动魔方
-				alive: {}, //直播
+				alive: {}, 
 				scrollBox: {}, //快速选择分类
 				titles: {}, //标题
 				goodList: {}, //商品列表(商品列表、首发新品、热门榜单、促销单品、精品推荐)
@@ -364,9 +364,11 @@
 			// #ifdef H5
 			this.isTop = 0
 			// #endif
-
 		},
-
+		onPullDownRefresh() {
+			this.diyData();
+			this.getIndexData();
+		},
 		// #ifdef MP
 		//发送给朋友
 		onShareAppMessage: function() {
@@ -561,14 +563,12 @@
 					that.seckill = data.seckill;
 					that.coupon = data.coupon;
 					this.$Cache.set('TAB_BAR', data.tabBar.default.tabBarList)
-					setTimeout(() => {
-						// this.isNodes++;
-					}, 0);
 					setTimeout(() => {
 						this.showSkeleton = false
-					}, 2000)
-
-
+					}, 1500)
+					uni.stopPullDownRefresh({
+						success: (e) => {}
+					});
 				});
 			},
 			getIndexData() {

template/uni-app/pages/live_list/index.vue

@@ -1,7 +1,6 @@
 <template>
 	<!-- #ifdef MP -->
 	<view v-if="liveList.length > 0">
-		<!-- 直播 -->
 			<view class="live-wrapper-b">
 				<navigator class="live-item-b" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id" hover-class="none" :style="[{'background':bg},{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
 					<view class="img-box">
@@ -15,7 +14,7 @@
 						</view>
 						<view class="label bgred" v-if="item.live_status==101">
 							<image src="/static/images/live-01.png" mode="" style="width: 21rpx; height: 22rpx;"></image>
-							<text>直播中</text>
+							<text>进行中</text>
 						</view>
 						<image :src="item.share_img"></image>
 					</view>
@@ -59,7 +58,6 @@
 			this.getLiveList();
 		},
 		methods: {
-			// 直播
 			getLiveList: function() {
 				let limit = this.$config.LIMIT;
 				if(!this.isScroll) return

template/uni-app/pages/users/user_cash/index.vue

@@ -265,10 +265,10 @@
 				// if (this.prevent) return
 				// this.prevent = true
 				if (that.currentTab == 0) { //银行卡
-					if (value.name.length == 0) return this.$util.Tips({
+					if (!value.name.trim()) return this.$util.Tips({
 						title: '请填写持卡人姓名'
 					});
-					if (value.cardnum.length == 0) return this.$util.Tips({
+					if (!value.cardnum.trim()) return this.$util.Tips({
 						title: '请填写卡号'
 					});
 					if (that.index == 0) return this.$util.Tips({
@@ -278,7 +278,7 @@
 					value.bankname = that.array[that.index];
 				} else if (that.currentTab == 1) { //微信
 					value.extract_type = 'weixin';
-					if (value.name.length == 0) return this.$util.Tips({
+					if (!value.name.trim()) return this.$util.Tips({
 						title: '请填写微信号'
 					});
 					value.weixin = value.name;
@@ -291,7 +291,7 @@
 					value.alipay_code = value.name;
 					value.qrcode_url = that.qrcodeUrlZ;
 				}
-				if (value.money.length == 0) return this.$util.Tips({
+				if (!value.money.trim()) return this.$util.Tips({
 					title: '请填写提现金额'
 				});
 				if (Number(value.money) < Number(that.minPrice)) return this.$util.Tips({

template/uni-app/pages/users/user_info/index.vue

@@ -40,11 +40,13 @@
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view>昵称</view>
-						<view class='input'><input type='text' name='nickname' :value='userInfo.nickname'></input></view>
+						<view class='input'><input type='text' name='nickname' :value='userInfo.nickname'></input>
+						</view>
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view>手机号码</view>
-						<navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-if="!userInfo.phone">
+						<navigator url="/pages/users/user_phone/index" hover-class="none" class="input"
+							v-if="!userInfo.phone">
 							点击绑定手机号<text class="iconfont icon-xiangyou"></text>
 						</navigator>
 						<view class='input acea-row row-between-wrapper' v-else>
@@ -75,7 +77,12 @@
 						</navigator>
 					</view>
 					<!-- #endif -->
-					
+					<view class="item acea-row row-between-wrapper" v-if="userInfo.phone">
+						<view>更换手机号码</view>
+						<navigator url="/pages/users/user_phone/index?type=1" hover-class="none" class="input">
+							点击更换手机号码<text class="iconfont icon-xiangyou"></text>
+						</navigator>
+					</view>
 					<!-- #ifdef APP-PLUS -->
 					<view class="item acea-row row-between-wrapper" v-if="userInfo.phone">
 						<view>密码</view>
@@ -83,18 +90,21 @@
 							点击修改密码<text class="iconfont icon-xiangyou"></text>
 						</navigator>
 					</view>
+					<view class="item acea-row row-between-wrapper" @click="initData">
+						<view>缓存大小</view>
+						<view class="input">
+							{{fileSizeString}}<text class="iconfont icon-xiangyou"></text>
+						</view>
+					</view>
 					<!-- #endif -->
 
-					<view class="item acea-row row-between-wrapper" v-if="userInfo.phone">
-						<view>更换手机号码</view>
-						<navigator url="/pages/users/user_phone/index?type=1" hover-class="none" class="input">
-							点击更换手机号码<text class="iconfont icon-xiangyou"></text>
-						</navigator>
-					</view>
+
 				</view>
+
 				<button class='modifyBnt bg-color' formType="submit">保存修改</button>
 				<!-- #ifdef H5 -->
-				<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin" v-if="!this.$wechat.isWeixin()">退出登录</view>
+				<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin"
+					v-if="!this.$wechat.isWeixin()">退出登录</view>
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
 				<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin">退出登录</view>
@@ -104,7 +114,8 @@
 		<!-- #ifdef MP -->
 		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 		<!-- #endif -->
-		<canvas canvas-id="canvas" v-if="canvasStatus" :style="{width: canvasWidth + 'px', height: canvasHeight + 'px',position: 'absolute',left:'-100000px',top:'-100000px'}"></canvas>
+		<canvas canvas-id="canvas" v-if="canvasStatus"
+			:style="{width: canvasWidth + 'px', height: canvasHeight + 'px',position: 'absolute',left:'-100000px',top:'-100000px'}"></canvas>
 	</view>
 </template>
 
@@ -134,7 +145,7 @@
 			authorize
 			// #endif
 		},
-		mixins:[colors],
+		mixins: [colors],
 		data() {
 			return {
 				userInfo: {},
@@ -145,7 +156,8 @@
 				isShowAuth: false, //是否隐藏授权
 				canvasWidth: "",
 				canvasHeight: "",
-				canvasStatus: false
+				canvasStatus: false,
+				fileSizeString: ''
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -162,11 +174,84 @@
 		onLoad() {
 			if (this.isLogin) {
 				this.getUserInfo();
+				this.formatSize()
 			} else {
 				toLogin();
 			}
 		},
 		methods: {
+			formatSize() {
+				let that = this;
+				plus.cache.calculate(function(size) {
+					let sizeCache = parseInt(size);
+					if (sizeCache == 0) {
+						that.fileSizeString = "0B";
+					} else if (sizeCache < 1024) {
+						that.fileSizeString = sizeCache + "B";
+					} else if (sizeCache < 1048576) {
+						that.fileSizeString = (sizeCache / 1024).toFixed(2) + "KB";
+					} else if (sizeCache < 1073741824) {
+						that.fileSizeString = (sizeCache / 1048576).toFixed(2) + "MB";
+					} else {
+						that.fileSizeString = (sizeCache / 1073741824).toFixed(2) + "GB";
+					}
+				});
+			},
+			
+			initData() {
+				uni.showModal({
+					title: '清楚缓存',
+					content: '确定清楚本地缓存数据吗?',
+					success: (res)=>  {
+						if (res.confirm) {
+							this.clearCache()
+							this.formatSize()
+						} else if (res.cancel) {
+							return that.$util.Tips({
+								title: '已取消'
+							});
+						}
+					}
+				});
+			},
+			clearCache() {
+				let that = this;
+				let os = plus.os.name;
+				if (os == 'Android') {
+					let main = plus.android.runtimeMainActivity();
+					let sdRoot = main.getCacheDir();
+					let files = plus.android.invoke(sdRoot, "listFiles");
+					let len = files.length;
+					for (let i = 0; i < len; i++) {
+						let filePath = '' + files[i]; // 没有找到合适的方法获取路径，这样写可以转成文件路径  
+						plus.io.resolveLocalFileSystemURL(filePath, function(entry) {
+							if (entry.isDirectory) {
+								entry.removeRecursively(function(entry) { //递归删除其下的所有文件及子目录  
+									uni.showToast({
+										title: '缓存清理完成',
+										duration: 2000
+									});
+									that.formatSize(); // 重新计算缓存  
+								}, function(e) {
+									console.log(e.message)
+								});
+							} else {
+								entry.remove();
+							}
+						}, function(e) {
+							console.log('文件路径读取失败')
+						});
+					}
+				} else { // ios暂时未找到清理缓存的方法，以下是官方提供的方法，但是无效，会报错  
+					plus.cache.clear(function() {
+						uni.showToast({
+							title: '缓存清理完成',
+							duration: 2000
+						});
+						that.formatSize();
+					});
+				}
+			},
 			/**
 			 * 授权回调
 			 */
@@ -182,8 +267,7 @@
 			 */
 			Setting: function() {
 				uni.openSetting({
-					success: function(res) {
-					}
+					success: function(res) {}
 				});
 			},
 			switchAccounts: function(index) {
@@ -239,8 +323,7 @@
 											url: '/pages/index/index'
 										})
 									})
-									.catch(err => {
-									});
+									.catch(err => {});
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
@@ -301,7 +384,7 @@
 				let that = this,
 					value = e.detail.value,
 					userInfo = that.switchUserInfo[that.userIndex];
-				if (!value.nickname) return that.$util.Tips({
+				if (!value.nickname.trim()) return that.$util.Tips({
 					title: '用户姓名不能为空'
 				});
 				value.avatar = this.userInfo.avatar;
@@ -327,10 +410,11 @@
 </script>
 
 <style scoped lang="scss">
-	.cartcolor{
+	.cartcolor {
 		color: var(--view-theme);
-		border: 1px solid var(--view-theme) ;
+		border: 1px solid var(--view-theme);
 	}
+
 	.personal-data .wrapper {
 		margin: 10rpx 0;
 		background-color: #fff;