1212

pages/onlineproductselection/onlineproductselection.vue

@@ -219,9 +219,13 @@ export default {
           }
           uni.hideLoading();
         }
+		 uni.hideLoading();
       } catch (error) {
         uni.hideLoading();
-      }
+		  
+      }finally{
+		   uni.hideLoading();
+	  }
     },
     sortByPrice() {
       this.sortBy = this.sortBy === "price" ? "" : "price";

pages/ordermanagement/index.vue

@@ -156,10 +156,86 @@ export default {
           status: 3,
         },
       ],
+	  uid: "",
+	  authorization: "",
     };
   },
   async onLoad() {
-    await getPhpToken()
+
+	
+	
+	console.log("进了我的页面了");
+
+	
+	await readAppInfo();
+	await getPhpToken();
+	return;
+	let jurisdiction = uni.getStorageSync("jurisdiction") || [];
+	console.log("jurisdiction", jurisdiction);
+	let mnuList = this.mnu;
+	if (jurisdiction) {
+	  jurisdiction.forEach((res, index) => {
+	    mnuList.forEach((result, i) => {
+	      if (res == result.id) {
+	        result.show = true;
+	      }
+	      return result;
+	    });
+	    return res;
+	  });
+	  this.mnu = mnuList;
+	}
+	
+	console.log(this.mnu);
+	
+	setTimeout(function () {
+	  uni.hideLoading();
+	}, 700);
+	
+	console.log("我的show===>>>>>>");
+	
+	this.authorization = uni.getStorageSync("authorization");
+	let userinfo = uni.getStorageSync("userinfo");
+	this.uid = userinfo.uid;
+	console.log("onshow");
+	return;
+	
+	let authorization = uni.getStorageSync("authorization");
+	// let userinfo = uni.getStorageSync('userinfo')
+	let selectmerchant = uni.getStorageSync("selectmerchant");
+	let uid = userinfo.uid;
+	console.log(selectmerchant, authorization, userinfo);
+	if (authorization && uid) {
+	  if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
+	    uni.redirectTo({
+	      url: "/openmerchant/guide/index", //有或者没有商户 没有金额支付and激活码支付
+	    });
+	    return;
+	  } else if (
+	    selectmerchant.merId > 0 &&
+	    (selectmerchant.status == 1 || selectmerchant.status == 5)
+	  ) {
+	    return;
+	  } else if (
+	    selectmerchant.merId >= 0 &&
+	    (selectmerchant.status == 3 || selectmerchant.status == 4)
+	  ) {
+	    uni.redirectTo({
+	      url: "/openmerchant/shopentry/process?mer_id=" + selectmerchant.merId, //已开通商户未填写资料
+	    });
+	    return;
+	  } else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
+	    uni.redirectTo({
+	      url: "/openmerchant/shopentry/processaudit?submitCode=" + 3, //已开通商户待审核
+	    });
+	    return;
+	  } else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
+	    uni.redirectTo({
+	      url: "/openmerchant/shopentry/processaudit?submitCode=" + 2, //已开通商户审核拒绝
+	    });
+	    return;
+	  }
+	}
   },
   async onShow() {
    

pages/user/login/index.vue

@@ -385,7 +385,7 @@ export default {
                       if (data.data.status == 200) {
                         uni.setStorageSync("selectmerchant", data.data.data);
                         let storeStaff = uni.getStorageSync("storeStaff");
-						//  getPhpToken()
+						 getPhpToken()
                         if (storeStaff != null) {
                           queryStoreBranch({
                             id: storeStaff.department

utils/readAppInfo.js

@@ -263,6 +263,10 @@ export async function getPhpToken(merId) {
   // console.log("phpToken", phpToken);
   // console.log("selectmerchant", selectmerchant);
   if (!phpToken && (selectmerchant && selectmerchant.merId > 0) || merId > 0) {
+	  uni.showLoading({
+		  title:"数据加载中",
+		  mask:true
+	  })
      const merIdS = merId || selectmerchant.merId || ""
     try {
       const res = await getPhpGlobalToken({
@@ -271,9 +275,17 @@ export async function getPhpToken(merId) {
       if (res.data.status == 200) {
         const token = res.data.data.token || "";
         uni.setStorageSync("phpToken", token);
+		console.log(this,"uni.navigateBack({})")
+		if(this.$router){
+			this.$router.go(0)
+		}else{
+			window.location.reload()
+		}
+		
       } else {
         uni.setStorageSync("phpToken", "");
       }
+	  
     } catch (error) {}
   }
 }