下单流程优化

hdApp/src/pagesClient/official/apply.vue

@@ -25,7 +25,7 @@
       <view class="module-com">
         <view class="module-tit">
           <span>门店照片</span>
-          <span class="app-color-3">（必填）</span>
+          <span class="app-color-3">（选填）</span>
         </view>
         <view class="module-det">
           <htz-image-upload :max="1" :compress="true" v-model="currentImgData" :headers="headers" :quality="95"
@@ -259,11 +259,7 @@ export default {
         { name: "mobile", rule: ["required"], msg: ["请填写手机号"] }
       ];
       let formData = this.form;
-      let checkRes = form.validation(formData, rules);
-      if(this.$util.isEmpty(this.form.cover)){
-        this.$msg('请上传照片')
-        return false
-      }
+      let checkRes = form.validation(formData, rules)
       if (!checkRes) {
         uni.showLoading({mask:true})
         setTimeout(() => {

hdApp/src/pagesClient/official/result.vue

@@ -20,7 +20,7 @@ export default {
     onUnload() {
     },
     onLoad () {
-      let scene = uni.getStorageSync('ghs_cg_scene')
+      let scene = uni.getStorageSync('ghsCgScene')
       if(scene){
         this.scene = scene
       }

hdApp/src/pagesPurchase/components/wangCg.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="model" v-if="show">
     <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
-    <view style="margin:30upx 0;color:white;font-size:34upx;">首次下单，请先完善资料</view>
-    <view class="freeApply" @click="apply">完善资料</view>
+    <view style="margin:30upx 0;color:white;font-size:34upx;">首次下单，请完善门店信息</view>
+    <view class="freeApply" @click="apply">完善</view>
   </view>
 </template>
 <script>

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -190,7 +190,7 @@ export default {
 			isNewCustom:false,
 			showInvite:false,
 			//推荐新人福利
-			tjFl:0
+			tjFl:0,
 		};
 	},
 	onPullDownRefresh() {
@@ -199,14 +199,20 @@ export default {
 		});
 	},
 	computed: {
-      	...mapGetters({ loginInfo: "getLoginInfo" }),
-		//判断是否已经开店 shish 2021.4.22
-		ifOpenShop(){
-			if(this.$util.isEmpty(this.loginInfo)){
-				this.notOpenShop = true
-			}else{
-				this.hdShopAdminId = this.loginInfo.shopAdminId
-			}
+      	...mapGetters({ loginInfo: "getLoginInfo" })
+	},
+	watch: {
+		loginInfo: {
+			deep: true,
+			handler: function(val) {
+				if(this.$util.isEmpty(val)){
+					this.notOpenShop = true
+				}else{
+					this.hdShopAdminId = val.shopAdminId
+					this.notOpenShop = false
+				}
+			},
+			immediate:true
 		}
 	},
 	onShow(){
@@ -316,7 +322,7 @@ export default {
 			//扫码采购 shish 20210614
 			if(this.option.scene){
 				
-				uni.setStorageSync('ghs_cg_scene', this.option.scene)
+				uni.setStorageSync('ghsCgScene', this.option.scene)
 
 				const scene = decodeURIComponent(this.option.scene);
 				var sceneItem = scene.split("&");

hdApp/src/pagesPurchase/particulars.vue

@@ -5,23 +5,36 @@
       <view class="result-view">
         <view :class="['iconfont', 'iconchenggong']"></view>
         <view class="result-title">支付成功</view>
+        <view v-if="ghsCgScene!=''">
+        <view>关闭页面后，微信下拉找到【花惠宝】小程序，如下图点采购可以再次下单</view>
+        <view style="margin-bottom:30upx;">
+          <image class="image" :src="`${constant.imgUrl}/cg/hd_cg_route.png`" mode="widthFix"></image>
+        </view>
+        </view>
         <button class="admin-button-com blue big" @click="goDetail">订单详情</button>
-        <button class="admin-button-com big" @click="goClose">返回首页</button>
+        <button v-if="ghsCgScene!=''" class="admin-button-com big" @click="goHome">返回首页</button>
+        <button v-else class="admin-button-com big" @click="goBack">返回</button>
       </view>
     </view>
   </view>
 </template>
-
 <script>
 export default {
   name: "AppResult",
   data() {
     return {
-      hasInit:false
+      hasInit:false,
+      ghsCgScene:''
     }
   },
   onLoad () {
     this.hasInit = true
+
+    let scene = uni.getStorageSync('ghsCgScene')
+    if(scene){
+      this.ghsCgScene = scene
+    }
+
   },
   onShow () {
     if(this.hasInit == false){
@@ -29,20 +42,19 @@ export default {
     }
   },
   methods: {
-    openMind(){
-      this.hasInit = false
-      this.pageTo({ url: "/pagesClient/official/warn"})
+    goBack(){
+      uni.navigateBack()
     },
-    goClose () {
-      this.pageTo({ url: "/admin/home/workbench", type: 3 })
+    goHome () {
+      uni.removeStorageSync('ghsCgScene')
+      this.pageTo({url:"/admin/home/workbench",type:4})
     },
     goDetail() {
-      this.pageTo({url: '/pagesPurchase/purDetails?status=2&id=' + this.option.id, type: 3})
+      this.pageTo({url: '/pagesPurchase/purDetails',query:{id:this.option.id,status:2}})
     }
   },
 };
 </script>
-
 <style lang="scss" scoped>
 .billing_box_bg {
   position: relative;
@@ -93,4 +105,4 @@ export default {
     width: 100%;
   }
 }
-</style>
+</style>

hdApp/src/utils/util.js

@@ -263,23 +263,14 @@ export const pageTo = item => {
 		let query = item.query ? parse(item.query) : "";
 		let allUrl = `${item.url}${query}`;
 		if (item.type == 2) {
-			uni.redirectTo({
-				url: allUrl
-			});
+			uni.redirectTo({ url: allUrl })
 		} else if (item.type == 3) {
-			uni.reLaunch({
-				url: allUrl
-			});
+			uni.reLaunch({ url: allUrl })
 		} else if (item.type == 4) {
-			console.log("switchTab", item.query);
 			uni.setStorageSync("switchTabQuery", item.query);
-			uni.switchTab({
-				url: item.url
-			});
+			uni.switchTab({ url: item.url })
 		} else {
-			uni.navigateTo({
-				url: allUrl
-			});
+			uni.navigateTo({ url: allUrl })
 		}
 	}
 };