434

pages/ordermanagement/index.vue

@@ -97,7 +97,7 @@ import {
 } from "@/commit/order.js";
 import quickPickUpVue from "./components/quickPickUp/quickPickUp.vue";
 import { toQueryString } from "@/utils/index.js";
-	import readAppInfo ,{getPhpToken}from '@/utils/readAppInfo.js';
+import readAppInfo, { getPhpToken } from "@/utils/readAppInfo.js";
 export default {
   components: { quickPickUpVue },
   data() {
@@ -156,94 +156,92 @@ export default {
           status: 3,
         },
       ],
-	  uid: "",
-	  authorization: "",
+      uid: "",
+      authorization: "",
     };
   },
   async onLoad() {
+    console.log("进了我的页面了");
 
-	
-	
-	console.log("进了我的页面了");
+    await readAppInfo();
+    await getPhpToken();
+    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, "this.mnu");
+
+    setTimeout(function () {
+      uni.hideLoading();
+    }, 700);
+
+    console.log("我的show===>>>>>>");
 
-	
-	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");
-	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;
-	  }
-	}
+    this.authorization = uni.getStorageSync("authorization");
+    let userinfo = uni.getStorageSync("userinfo");
+    this.uid = userinfo.uid;
+    console.log("onshow");
+    let authorization = uni.getStorageSync("authorization");
+    // let userinfo = uni.getStorageSync('userinfo')
+    let selectmerchant = uni.getStorageSync("selectmerchant");
+    let uid = userinfo.uid;
+    console.log(selectmerchant, authorization, userinfo, "authorization");
+    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;
+      }
+    } else {
+      uni.redirectTo({
+        url: "/pages/user/login/index?type=1",
+      });
+      return;
+    }
   },
   async onShow() {
-   
     let selectmerchant = uni.getStorageSync("selectmerchant");
     this.mer_id = selectmerchant.merId;
-      uni.showLoading({
+    uni.showLoading({
       title: "加载中",
     });
     try {
-     
       await this.getOrderListData();
       await this.getOrderStatusNumberData();
       await this.getAfterSaleListData();

shop/productManagementModule/index.vue

@@ -142,7 +142,6 @@ export default {
 
     await readAppInfo();
     await getPhpToken();
-    return;
     let jurisdiction = uni.getStorageSync("jurisdiction") || [];
     console.log("jurisdiction", jurisdiction);
     let mnuList = this.mnu;
@@ -207,6 +206,11 @@ export default {
         });
         return;
       }
+    }else {
+      uni.redirectTo({
+        url: "/pages/user/login/index?type=1",
+      });
+      return;
     }
   },
   async onShow() {