优化升级弹窗，以及委托订单，文章详情页面优化

pages/commissionedSales/delegation_details/index.vue

@@ -44,7 +44,7 @@
 					<view class="center-twoa">
 						委托方:
 					</view>
-					<view class="center-twob" >
+					<view class="center-twob">
 						{{objinfo.mer_info.mer_name}}
 					</view>
 				</view>
@@ -52,7 +52,7 @@
 					<view class="center-twoa">
 						被委托方:
 					</view>
-					<view class="center-twob" >
+					<view class="center-twob">
 						{{objinfo.entrust_mer_info.mer_name}}
 					</view>
 				</view>
@@ -114,7 +114,7 @@
 			</view>
 
 
-			<view class="content_bootm_one" v-for="(item,i) in objinfo.product_list">
+			<view class="content_bootm_one" v-for="(item,i) in objinfo.product_list" @click="Merchbaby(item)">
 				<view class="bootm_oneimg">
 					<image :src="item.image[0]" mode="aspectFit"></image>
 				</view>
@@ -163,14 +163,22 @@
 
 		},
 		methods: {
-
+			//商品详情
 			list(id) {
 				entrustdetail(id).then((res) => {
-console.log(res.data)
+
 					this.objinfo = res.data
 				})
 			},
+			//商品宝贝详情
+			Merchbaby(item) {
+				uni.navigateTo({
+					url: `/pages/goods_details/index?id=${item.product_id}`
+				})
 
+			},
+
+			//提交购物车
 			submit(item) {
 				addEntrustCart({
 					community_id: item.community_id

pages/index/index.vue

@@ -157,16 +157,7 @@
 			}
 		},
 		onShow() {
-			uni.startLocationUpdate({
-				success: res => {
-					console.log('开启接收位置消息成功')
 		
-				},
-				fail: err => {
-					this.selfLocation()
-				},
-				complete: msg => console.log('调用开启接收位置消息 API 完成')
-			});
 
 			//监听网络状态变化
 			uni.onNetworkStatusChange((res) => {

pages/plantGrass/plant_detail/index.vue

@@ -1,8 +1,10 @@
 <template>
 	<view :style="viewColor">
+			<!-- #ifdef H5 -->
 		<view class="head-menu">
 		  <view class='iconfont icon-xiangzuo' @click="returns"></view>
 		</view>
+			<!-- #endif -->
 		<view v-if="followDetail != null && followDetail" class="main" @click.stop="showManage = false">
 		<view v-if="followDetail.status != 1" class="approval_status">
 			<view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'">

store/modules/app.js

@@ -117,12 +117,16 @@ const actions = {
 		} else {
 			apptype = 1
 		}
-		console.log(apptype, '11111')
+
 		Appversion({
 			version: os.appWgtVersion,
 			type: apptype
 		}).then((res) => {
-			if (data) uni.showLoading({
+			
+			if (Object.keys(res.data.appInfo).length > 0) {
+
+
+				uni.showLoading({
 					title: '检查更新中'
 				})
 
@@ -144,11 +148,12 @@ const actions = {
 					} catch (e) {
 						console.log(e);
 					}
-				if (data) uni.hideLoading();
+					uni.hideLoading();
 				}
 
+			}
 		}).catch((err) => {
-			console.log(err)
+			// console.log(err)
 		})