登录优化

hdApp/src/admin/home/login.vue

@@ -214,6 +214,13 @@ export default {
 							replaceClientId({id:currentClientId})
 						}
 						// #endif
+
+						//返回上一页带参数
+						let pages = getCurrentPages();
+						let prevPage = pages[ pages.length - 2 ];
+						//修改上一页data里面的xjData
+						prevPage.$vm.backAction = 'login'
+
 						uni.navigateBack()
 					}
 				});

hdApp/src/admin/home/workbench.vue

@@ -255,6 +255,7 @@ export default {
       supplierList: [],
       //登录状态 0未登录 1登录仅用到了采购 2登录用到完整功能
       loginStyle :0,
+      backAction:'',
       countStat:{systemIncome:0,systemCount:0,debtCount:0,debtIncome:0,kfWxCount:0,kfWxIncome:0}
     };
   },

hdApp/src/pagesPurchase/components/wangCg.vue

@@ -3,8 +3,10 @@
     <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
     <view style="margin:45upx 0;color:white;font-size:34upx;">首次下单，请填写门店信息</view>
     <view class="freeApply" @click="apply">填写</view>
-    <view style="margin:55upx 0;color:white;font-size:27upx;" @click="goLogin()">我已经填过了，<text style="text-decoration:underline;">去登录</text></view>
-    <view style="margin:55upx 0;color:white;font-size:27upx;" >注册后，伙伴和员工也需要买花，请联系批发店</view>
+    <view style="margin:55upx 0;color:white;font-size:33upx;" @click="goLogin()">
+      <text style="text-decoration:underline;">直接登录</text>
+    </view>
+    <view style="margin:55upx 0;color:white;font-size:29upx;" >如您的伙伴需要买花，请联系批发店添加员工</view>
   </view>
 </template>
 <script>
@@ -64,9 +66,9 @@ export default {
   overflow: hidden;
   text-align: center;
   & > .noData_img {
-    width: 318upx;
-    height: 318upx;
-    margin: 100upx auto 0;
+    width: 280upx;
+    height: 280upx;
+    margin: 50upx auto 0;
   }
   & > .no_data_text {
     font-size: 32upx;

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -247,7 +247,8 @@ export default {
 			showClassRemind:false,
 			buyNotice:0,
 			isHd:1,
-			getappIdList: {}
+			getappIdList: {},
+			backAction:''
 		};
 	},
 	onPullDownRefresh() {
@@ -274,6 +275,10 @@ export default {
 	},
 	onShow(){
 
+		if(this.backAction == 'login'){
+			this.init()
+		}
+
 		if(this.xjData.hasUpdate == 1){
 
 			this.customData = this.hasColorInfo
@@ -448,8 +453,6 @@ export default {
 		},
 		init(){
 
-			this.init = false
-
 			//通过供货商小程序分享进采购页，注册的客户，注册后引导返回采购页
 			if(this.option.fromCg && this.option.fromCg == 1){
 				uni.setStorageSync('ghsCgOption', this.option)