同车牌号绑定提示显示修复，优惠券洗车修复，增加手机号格式错误无法进入部分页面

pages/addValidate/addValidate.vue

@@ -17,7 +17,7 @@
 			</view>
 			<scroll-view class="explain-box-body">
 				<text class="txt">
-					添加车辆成功
+					{{addSuccess}}
 				</text>
 			</scroll-view>
 			<view class="explain-btn" @click="btns">
@@ -32,6 +32,7 @@
 	import { ref } from 'vue';
 	import {onLoad} from '@dcloudio/uni-app'
 	import {addChepai}from '../../stor/addChepai/addChepai.js'
+import { storeToRefs } from 'pinia';
 	
 	const ac =addChepai()
 	const titles = ref('添加车牌')
@@ -39,6 +40,7 @@
 	const color = ref('#000')
 	const chepais = ref(null)
 	const isShows = ref(1)
+	const {addSuccess} =storeToRefs(ac)
 		const chuanzi = ref([{
 				id: 1,
 				as: ""

stor/Coupons/coupons.js

@@ -107,12 +107,6 @@ export const coupons = defineStore('coupons', () => {
 				console.log(mid);
 			}
 			console.log(resDats.value);
-			if (resDats.value.amount > 0) {
-
-				uni.navigateTo({
-					url: "/pages/payCoupons/payCoupons"
-				})
-			} else {
 			getShopid({
 				mid: uni.getStorageSync('mid'),
 				phone: uni.getStorageSync('phoneNumber')
@@ -120,9 +114,17 @@ export const coupons = defineStore('coupons', () => {
 				console.log(res);
 				console.log(res.data.networkId);
 				id.value = res.data.networkId
-					que.value = 1
+				uni.setStorageSync('networkId', id.value)
+				console.log('网点id' + id.value);
 
 			})
+			if (resDats.value.amount > 0) {
+
+				uni.navigateTo({
+					url: "/pages/payCoupons/payCoupons"
+				})
+			} else {
+				que.value = 1
 			}
 			// const mids = Number(mid)
 		}
@@ -259,6 +261,16 @@ export const coupons = defineStore('coupons', () => {
 		} else {
 			console.log("out_trade_no", res);
 			console.log('这是订单号' + res);
+			const orderRes = await getTimeOrder({
+				phoneNumber: uni.getStorageSync('phoneNumber'),
+				amount: datas.amount,
+				goodsId: datas.id,
+				goodsType: 3, //洗车订单
+				networkId: uni.getStorageSync('networkId'),
+				payType: 4, //优惠券洗车,
+				deviceId: uni.getStorageSync('mid'),
+				orderId: orderid.value
+			})
 			const res1 = await getWxPlay({
 				appId: appid,
 				phone: uni.getStorageSync('phoneNumber'),
@@ -271,7 +283,6 @@ export const coupons = defineStore('coupons', () => {
 			})
 			console.log(res1);
 
-
 			uni.requestPayment({
 				provider: 'wxpay',
 				timeStamp: res1.timeStamp,
@@ -307,21 +318,13 @@ export const coupons = defineStore('coupons', () => {
 									orderid
 									.value)
 								uni.setStorageSync('msg', '拉新券洗车')
-								const orderRes = await getTimeOrder({
+
-									phoneNumber: uni.getStorageSync('phoneNumber'),
-									amount: datas.amount,
-									goodsId: datas.id,
-									goodsType: 3, //洗车订单
-									networkId: datas.networkId,
-									payType: 4, //优惠券洗车,
-									deviceId: uni.getStorageSync('mid'),
-									orderId: orderid.value
-								})
 								uni.redirectTo({
 									url: '/pages/complete/complete'
 								})
 								const qaq = await getTincheCoupons({
-									phoneNumber: uni.getStorageSync('phoneNumber'),
+									phoneNumber: uni.getStorageSync(
+										'phoneNumber'),
 									oderId: orderid.value
 								})
 								uni.showToast({

stor/addChepai/addChepai.js

@@ -17,6 +17,8 @@ export const addChepai = defineStore('addChepai', () => {
 
 	const carRes = ref([])
 	
+	const  addSuccess = ref('添加车辆成功')
+
 
 	const addXin = async () => {
 		carList.value = await GetCarList({
@@ -49,6 +51,7 @@ export const addChepai = defineStore('addChepai', () => {
 				wechatName: uni.getStorageSync('wxname')
 			})
 			console.log(carRes.value);
+			addSuccess.value=carRes.value.msg
 			// const res = await getTincheCoupons({
 			// 	phoneNumber: uni.getStorageSync('phoneNumber')
 			// })
@@ -88,6 +91,7 @@ export const addChepai = defineStore('addChepai', () => {
 		getCarlists,
 		carRes,
 		gerCarRes,
-		getDelete
+		getDelete,
+		addSuccess
 	}
 })

unpackage/dist/dev/mp-weixin/pages/addValidate/addValidate.js

@@ -18,6 +18,7 @@ const _sfc_main = {
     common_vendor.ref("#000");
     const chepais = common_vendor.ref(null);
     const isShows = common_vendor.ref(1);
+    const { addSuccess } = common_vendor.storeToRefs(ac);
     const chuanzi = common_vendor.ref([
       {
         id: 1,
@@ -73,7 +74,8 @@ const _sfc_main = {
         }),
         d: isShows.value === 0
       }, isShows.value === 0 ? {
-        e: common_vendor.o(btns)
+        e: common_vendor.t(common_vendor.unref(addSuccess)),
+        f: common_vendor.o(btns)
       } : {});
     };
   }

unpackage/dist/dev/mp-weixin/pages/addValidate/addValidate.wxml

@@ -1 +1 @@
-<view class="navs"><view class="navBgm"><image class="left" src="https://www.jiubaotongxue.love/image/nav10.png" alt="" bindtap="{{a}}"/> 绑定车辆 </view></view><view class="addchepai"><chepai wx:if="{{c}}" bindnumString="{{b}}" u-i="09088cc9-0" bind:__l="__l" u-p="{{c}}"></chepai></view><view wx:if="{{d}}" class="explain"><view class="explain-box" scroll-y="true"><view class="explain-box-title"> 温馨提示 </view><scroll-view class="explain-box-body"><text class="txt"> 添加车辆成功 </text></scroll-view><view class="explain-btn" bindtap="{{e}}"> 确定 </view></view></view>
+<view class="navs"><view class="navBgm"><image class="left" src="https://www.jiubaotongxue.love/image/nav10.png" alt="" bindtap="{{a}}"/> 绑定车辆 </view></view><view class="addchepai"><chepai wx:if="{{c}}" bindnumString="{{b}}" u-i="09088cc9-0" bind:__l="__l" u-p="{{c}}"></chepai></view><view wx:if="{{d}}" class="explain"><view class="explain-box" scroll-y="true"><view class="explain-box-title"> 温馨提示 </view><scroll-view class="explain-box-body"><text class="txt">{{e}}</text></scroll-view><view class="explain-btn" bindtap="{{f}}"> 确定 </view></view></view>

unpackage/dist/dev/mp-weixin/stor/Coupons/coupons.js

@@ -77,11 +77,6 @@ const coupons = common_vendor.defineStore("coupons", () => {
         console.log(mid);
       }
       console.log(resDats.value);
-      if (resDats.value.amount > 0) {
-        common_vendor.index.navigateTo({
-          url: "/pages/payCoupons/payCoupons"
-        });
-      } else {
       api_api.getShopid({
         mid: common_vendor.index.getStorageSync("mid"),
         phone: common_vendor.index.getStorageSync("phoneNumber")
@@ -89,8 +84,15 @@ const coupons = common_vendor.defineStore("coupons", () => {
         console.log(res);
         console.log(res.data.networkId);
         id.value = res.data.networkId;
-          que.value = 1;
+        common_vendor.index.setStorageSync("networkId", id.value);
+        console.log("网点id" + id.value);
+      });
+      if (resDats.value.amount > 0) {
+        common_vendor.index.navigateTo({
+          url: "/pages/payCoupons/payCoupons"
         });
+      } else {
+        que.value = 1;
       }
     }
   };
@@ -204,6 +206,18 @@ const coupons = common_vendor.defineStore("coupons", () => {
     } else {
       console.log("out_trade_no", res);
       console.log("这是订单号" + res);
+      await api_api.getTimeOrder({
+        phoneNumber: common_vendor.index.getStorageSync("phoneNumber"),
+        amount: datas.amount,
+        goodsId: datas.id,
+        goodsType: 3,
+        //洗车订单
+        networkId: common_vendor.index.getStorageSync("networkId"),
+        payType: 4,
+        //优惠券洗车,
+        deviceId: common_vendor.index.getStorageSync("mid"),
+        orderId: orderid.value
+      });
       const res1 = await api_api.getWxPlay({
         appId: common_baseurl.appid,
         phone: common_vendor.index.getStorageSync("phoneNumber"),
@@ -247,23 +261,13 @@ const coupons = common_vendor.defineStore("coupons", () => {
                   orderid.value
                 );
                 common_vendor.index.setStorageSync("msg", "拉新券洗车");
-                await api_api.getTimeOrder({
-                  phoneNumber: common_vendor.index.getStorageSync("phoneNumber"),
-                  amount: datas.amount,
-                  goodsId: datas.id,
-                  goodsType: 3,
-                  //洗车订单
-                  networkId: datas.networkId,
-                  payType: 4,
-                  //优惠券洗车,
-                  deviceId: common_vendor.index.getStorageSync("mid"),
-                  orderId: orderid.value
-                });
                 common_vendor.index.redirectTo({
                   url: "/pages/complete/complete"
                 });
                 const qaq = await api_api.getTincheCoupons({
-                  phoneNumber: common_vendor.index.getStorageSync("phoneNumber"),
+                  phoneNumber: common_vendor.index.getStorageSync(
+                    "phoneNumber"
+                  ),
                   oderId: orderid.value
                 });
                 common_vendor.index.showToast({

unpackage/dist/dev/mp-weixin/stor/addChepai/addChepai.js

@@ -4,6 +4,7 @@ const api_api = require("../../api/api.js");
 const addChepai = common_vendor.defineStore("addChepai", () => {
   const carList = common_vendor.ref([]);
   const carRes = common_vendor.ref([]);
+  const addSuccess = common_vendor.ref("添加车辆成功");
   const addXin = async () => {
     carList.value = await api_api.GetCarList({
       phoneNumber: common_vendor.index.getStorageSync("phoneNumber")
@@ -34,6 +35,7 @@ const addChepai = common_vendor.defineStore("addChepai", () => {
         wechatName: common_vendor.index.getStorageSync("wxname")
       });
       console.log(carRes.value);
+      addSuccess.value = carRes.value.msg;
       const res = await api_api.tincheUpApi({
         phoneNumber: common_vendor.index.getStorageSync("phoneNumber"),
         carNo: data
@@ -66,7 +68,8 @@ const addChepai = common_vendor.defineStore("addChepai", () => {
     getCarlists,
     carRes,
     gerCarRes,
-    getDelete
+    getDelete,
+    addSuccess
   };
 });
 exports.addChepai = addChepai;

unpackage/dist/dev/mp-weixin/utils/interceptor.js

@@ -6,7 +6,17 @@ list.forEach((item) => {
   console.log(item, "router list item");
   common_vendor.index.addInterceptor(item, {
     invoke(e) {
-      const token = common_vendor.index.getStorageSync("phoneNumber");
+      const phonePattern = /^1[3456789]\d{9}$/;
+      let token;
+      if (phonePattern.test(common_vendor.index.getStorageSync("phoneNumber"))) {
+        token = common_vendor.index.getStorageSync("phoneNumber");
+      } else {
+        common_vendor.index.showToast({
+          icon: "none",
+          title: "登录失败,请重新登录",
+          duration: 1e3
+        });
+      }
       const url = e.url.split("?")[0];
       if (!needLogin.includes(url) && !token) {
         common_vendor.index.navigateTo({

utils/interceptor.js

@@ -9,7 +9,18 @@ let needLogin = ['/pages/index/index','/pages/handle/handle','/pages/login/login
                         // console.log(e,'routerjs invoke')
                         // const token = uni.getStorageSync('token')
 						// 暂时将token验证替换手机号
-						const token = uni.getStorageSync('phoneNumber')
+						const phonePattern = /^1[3456789]\d{9}$/;
+						let token 
+						if(phonePattern.test(uni.getStorageSync('phoneNumber'))){
+							token=uni.getStorageSync('phoneNumber')
+						}else{
+							uni.showToast({
+								icon:"none",
+								title:"登录失败,请重新登录",
+								duration:1000
+							})
+						}
+						
                         //获取当前页面路径（即url去掉"?"和"?"后的参数）
                         // console.log(token,'router index token')
                         const url = e.url.split('?')[0]