首次提交

components/codecook-carnumber/codecook-carnumber.vue

@@ -45,6 +45,10 @@ export default {
       type: Number,
       default: 8,
     },
+    disable: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -81,10 +85,13 @@ export default {
       this.fill = fill;
     },
     focusHandler(index = 0) {
-      this.focus = true;
+      if(this.disable){
+        this.focus = true;
+
+        this.current = index;
+        console.log(this.current);
+      }
 
-      this.current = index;
-      console.log(this.current);
     },
     keyDeleteHandler() {
       this.$set(this.fill, this.current, "");

js_sdk/request/requestConfig.js

@@ -26,7 +26,7 @@ let $http = new request({
     //是否提示--默认提示
     isPrompt: true,
     //是否显示请求动画
-    load: true,
+    load: false,
     //是否使用处理数据模板
     isFactory: true,
     //列表接口是否有加载判断
@@ -126,4 +126,4 @@ $http.dataFactory = function (options, resolve) {
     uni.stopPullDownRefresh();
     return callback;
 };
-export default $http;
+export default $http;

manifest.json

@@ -5,7 +5,7 @@
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
-	"sassImplementationName":"node-sass",
+    "sassImplementationName" : "node-sass",
     "app-plus" : {
         "usingComponents" : true,
         "nvueCompiler" : "uni-app",
@@ -70,7 +70,7 @@
     },
     "mp-weixin" : {
         "libVersion" : "latest",
-        "appid" : "wxcce76742bc3de81d",
+        "appid" : "wx7b5a6feaaed01adf",
         "optimization" : {
             "subPackages" : true
         },

package-lock.json

@@ -1,5 +1,6 @@
 {
-  "version": "1.2",
+  "name": "生成二维码。传入链接，即可使用，可快速扫出链接",
+  "version": "1.0.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -10,4 +10,4 @@
         "可快速扫出链接",
         "已解决部分华为荣耀手机缺角问题"
     ]
-}
+}

pages.json

@@ -1,10 +1,10 @@
 {
     "pages": [
+
         {
-            "path": "pages/chooseIdentity/index",
+            "path": "pages/login/login",
             "style": {
-                "navigationStyle": "custom",
-                "navigationBarTitleText": "选择身份",
+                "navigationBarTitleText": "登录",
                 "app-plus": {
                     "titleNView": {
                         "buttons": [
@@ -18,6 +18,8 @@
                     }
                 },
                 "usingComponents": {
+                    "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+
                     "van-button": "/wxcomponents/weapp/dist/button/index",
                     "van-toast": "/wxcomponents/weapp/dist/toast/index",
                     "van-field": "/wxcomponents/weapp/dist/field/index",
@@ -28,31 +30,32 @@
             }
         },
         {
-            "path": "pages/login/login",
-            "style": {
-                "navigationBarTitleText": "登录",
-                "app-plus": {
-                    "titleNView": {
-                        "buttons": [
-                            {
-                                "text": "\ue534",
-                                "fontSrc": "/static/uni.ttf",
-                                "fontSize": "22px",
-                                "color": "#FFFFFF"
+                    "path": "pages/chooseIdentity/index",
+                    "style": {
+                        "navigationStyle": "custom",
+                        "navigationBarTitleText": "选择身份",
+                        "app-plus": {
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
                             }
-                        ]
+                        },
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index"
+                        }
                     }
                 },
-                "usingComponents": {
-                    "van-button": "/wxcomponents/weapp/dist/button/index",
-                    "van-toast": "/wxcomponents/weapp/dist/toast/index",
-                    "van-field": "/wxcomponents/weapp/dist/field/index",
-                    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-                    "van-picker": "/wxcomponents/weapp/dist/picker/index",
-                    "van-dialog": "/wxcomponents/weapp/dist/dialog/index"
-                }
-            }
-        },
         {
             "path": "pages/index/index",
             "style": {
@@ -93,6 +96,80 @@
         {
             "root": "pages/subPackages",
             "pages": [
+                {
+                    "path": "czlc/gonggaoCzlc",
+                    "style": {
+                        "navigationBarTitleText": "码头预约流程",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
+                {
+                    "path": "czlc/sjCzlc",
+                    "style": {
+                        "navigationBarTitleText": "码头预约流程",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
                 {
                     "path": "carmange/add",
                     "style": {
@@ -749,4 +826,4 @@
         ]
     },
     "lazyCodeLoading": "requiredComponents"
-}
+}

pages/chooseIdentity/index.vue

@@ -48,7 +48,10 @@ export default {
     };
   },
   mounted() {},
+
   methods: {
+
+
     chooseIdentity(e) {
       this.isSelect = e;
     },

pages/index/index.vue

@@ -20,7 +20,7 @@
       <div class="bz">
         <div>
           <img
-            src="https://www.idea-sf.com/dockPic/image/1.png"
+            src="https://wxdock.astrazeneca.cn/dockPic/image/1.png"
             class="yyicon"
             alt=""
           />
@@ -29,7 +29,7 @@
         <div class="jiantou">---></div>
         <div>
           <img
-            src="https://www.idea-sf.com/dockPic/image/2.png"
+            src="https://wxdock.astrazeneca.cn/dockPic/image/2.png"
             class="yyicon"
             alt=""
           />
@@ -38,7 +38,7 @@
         <div class="jiantou">---></div>
         <div>
           <img
-            src="https://www.idea-sf.com/dockPic/image/3.png"
+            src="https://wxdock.astrazeneca.cn/dockPic/image/3.png"
             class="yyicon"
             alt=""
           />
@@ -47,7 +47,7 @@
         <div class="jiantou">---></div>
         <div>
           <img
-            src="https://www.idea-sf.com/dockPic/image/4.png"
+            src="https://wxdock.astrazeneca.cn/dockPic/image/4.png"
             class="yyicon"
             alt=""
           />
@@ -56,7 +56,7 @@
         <div class="jiantou">---></div>
         <div>
           <img
-            src="https://www.idea-sf.com/dockPic/image/5.png"
+            src="https://wxdock.astrazeneca.cn/dockPic/image/5.png"
             class="yyicon"
             alt=""
           />
@@ -66,8 +66,8 @@
     </div>
     <div class="report">
       <div class="left">
-        <img src="https://www.idea-sf.com/dockPic/image/6.png" alt="" />
-        <div class="line"></div>
+        <img src="https://wxdock.astrazeneca.cn/dockPic/image/6.png" alt="" />
+        <div class="line" style="margin-left: 20rpx" ></div>
       </div>
       <div class="right">
         <div>
@@ -78,10 +78,14 @@
 <!--            <div class="day">1天前</div>-->
 <!--          </div>-->
           <div class="info">
-            <div class="label chaochuyincang">
-              {{ noticeText }}
+            <div @click="jumpPage('/pages/subPackages/czlc/gonggaoCzlc')" class="label chaochuyincang" style="color: #8A0554;font-weight: bold;text-decoration:  #8A0554">
+<!--              {{ noticeText }}-->
+              预约指南
+            </div>
+            <div class="day">
+<!--              {{ timeText }}-->
+
             </div>
-            <div class="day">{{ timeText }}</div>
           </div>
         </div>
       </div>
@@ -93,12 +97,12 @@
       >
         <div class="text">送货预约</div>
         <img
-          src="https://www.idea-sf.com/dockPic/image/7.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/7.png"
           class="back"
           alt=""
         />
         <img
-          src="https://www.idea-sf.com/dockPic/image/7-1.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/7-1.png"
           class="icon"
           alt=""
         />
@@ -109,12 +113,12 @@
       >
         <div class="text">取货预约</div>
         <img
-          src="https://www.idea-sf.com/dockPic/image/8.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/8.png"
           class="back"
           alt=""
         />
         <img
-          src="https://www.idea-sf.com/dockPic/image/8-1.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/8-1.png"
           class="icon"
           alt=""
         />
@@ -126,12 +130,12 @@
       >
         <div class="text">预约历史</div>
         <img
-          src="https://www.idea-sf.com/dockPic/image/9.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/9.png"
           class="back"
           alt=""
         />
         <img
-          src="https://www.idea-sf.com/dockPic/image/9-1.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/9-1.png"
           class="icon"
           alt=""
         />
@@ -144,80 +148,81 @@
       >
         <div class="text">扫码核验</div>
         <img
-          src="https://www.idea-sf.com/dockPic/image/7.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/7.png"
           class="back"
           alt=""
         />
         <img
-          src="https://www.idea-sf.com/dockPic/image/7-1.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/7-1.png"
           class="icon"
           alt=""
         />
       </div>
     </div>
     <div class="menu-list" v-else>
+
       <div
         class="menu-row"
-        @click="jumpPage('/pages/subPackages/choosecar/index?zxtype=取货预约')"
+        @click="jumpPage('/pages/subPackages/choosecar/index?zxtype=送货预约')"
       >
-        <div class="text">取货预约</div>
+        <div class="text">送货预约</div>
         <img
-          src="https://www.idea-sf.com/dockPic/image/7.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/8.png"
           class="back"
           alt=""
         />
         <img
-          src="https://www.idea-sf.com/dockPic/image/7-1.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/8-1.png"
           class="icon"
           alt=""
         />
       </div>
       <div
         class="menu-row"
-        @click="jumpPage('/pages/subPackages/choosecar/index?zxtype=送货预约')"
+        @click="jumpPage('/pages/subPackages/yy_history/index')"
       >
-        <div class="text">送货预约</div>
+        <div class="text">预约历史</div>
         <img
-          src="https://www.idea-sf.com/dockPic/image/8.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/9.png"
           class="back"
           alt=""
         />
         <img
-          src="https://www.idea-sf.com/dockPic/image/8-1.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/9-1.png"
           class="icon"
           alt=""
         />
       </div>
       <div
         class="menu-row"
-        @click="jumpPage('/pages/subPackages/yy_history/index')"
+        @click="jumpPage('/pages/subPackages/carmange/index')"
       >
-        <div class="text">预约历史</div>
+        <div class="text">车辆管理</div>
         <img
-          src="https://www.idea-sf.com/dockPic/image/9.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/10.png"
           class="back"
           alt=""
         />
         <img
-          src="https://www.idea-sf.com/dockPic/image/9-1.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/image/10-1.png"
           class="icon"
           alt=""
         />
       </div>
       <div
-        class="menu-row"
-        @click="jumpPage('/pages/subPackages/carmange/index')"
+          class="menu-row"
+          @click="jumpPage('/pages/subPackages/choosecar/index?zxtype=取货预约')"
       >
-        <div class="text">车辆管理</div>
+        <div class="text">取货预约</div>
         <img
-          src="https://www.idea-sf.com/dockPic/image/10.png"
-          class="back"
-          alt=""
+            src="https://wxdock.astrazeneca.cn/dockPic/image/7.png"
+            class="back"
+            alt=""
         />
         <img
-          src="https://www.idea-sf.com/dockPic/image/10-1.png"
-          class="icon"
-          alt=""
+            src="https://wxdock.astrazeneca.cn/dockPic/image/7-1.png"
+            class="icon"
+            alt=""
         />
       </div>
     </div>

pages/login/login.vue

@@ -16,12 +16,30 @@
           />
         </div>
         <div class="inputBox">
+
           <img src="../../common/assets/image/pswicon.svg" alt="" />
           <input
-            type="password"
+
+              v-if="isPassWord"
+            :password="true"
             placeholder="请输入密码"
             v-model="loginForm.password"
+              style="border-right: none"
+          />
+          <input
+              v-if="!isPassWord"
+
+              :password="false"
+              placeholder="请输入密码"
+              style="border-right: none"
+
+              v-model="loginForm.password"
           />
+
+          <div style="background: #f3f5f9;height: 100rpx;line-height: 100rpx;padding: 4rpx 0;border: 1rpx solid rgba(29, 24, 188, 0.05);border-left: none;padding-left: 20rpx; padding-right: 20rpx;" @click="changeIsPassWord()" >
+            <van-icon name="eye-o" v-if="isPassWord" />
+            <van-icon name="closed-eye" v-if="!isPassWord"/>
+          </div>
         </div>
         <div class="inputBox">
           <img src="../../common/assets/image/yzmicon.svg" alt="" />
@@ -37,7 +55,10 @@
             class="yanzhengImg"
           />
         </div>
+        <div class="inputBox" style="    justify-content: flex-end;">
+          <van-checkbox checked-color="#8a0554" :value="isSetPassWord" @change=changeIsSetPassWord() bind:change="onChange">记住密码</van-checkbox>
 
+        </div>
         <div style="margin-top: 2vh">
           <van-button
             type="default"
@@ -51,17 +72,19 @@
       </div>
     </div>
     <div class="bottomTips">
-      <label class="radio">
-        <radio value="r1" checked="true" color="#8a0554" />
-        已阅读并同意<span style="color: #8a0554"
-          >《服务协议条款及隐私政策》</span
-        >
-      </label>
+
+        <van-checkbox :value="isCheck" @change="getIsCheck" checked-color="#8a0554" />
+        已阅读并同意
+        </van-checkbox>
+      <span style="color: #8a0554"
+      >《服务协议条款及隐私政策》
+    </span>
     </div>
     <van-dialog id="van-toast" />
   </div>
 </template>
 <script>
+
 import Dialog from "../../wxcomponents/weapp/dist/dialog/dialog.js";
 import { login } from "@/js_sdk/http.js";
 import w_md5 from "@/js_sdk/zww-md5/w_md5.js";
@@ -69,6 +92,9 @@ import w_md5 from "@/js_sdk/zww-md5/w_md5.js";
 export default {
   data() {
     return {
+      isSetPassWord:false,
+      isPassWord:false,
+      isCheck:false,
       loginForm: {
         userName: "",
         password: "",
@@ -85,9 +111,33 @@ export default {
     // login()
 
     this.captchaImageRefresh(this.loginForm);
-    this.loginForm.type = e.type ? e.type : "USER";
+    this.loginForm.type = 'BIZ';
+    const rememberedUser = wx.getStorageSync('rememberedUser');
+    if (rememberedUser && rememberedUser.isSetPassWord) {
+      // 赋值账号密码到输入框
+      this.loginForm.userName = rememberedUser.userName;
+      this.loginForm.password = rememberedUser.password;
+      // 勾选"记住密码"
+      this.isSetPassWord = true;
+    }
+    // this.loginForm.type = e.type ? e.type : "USER";
   },
   methods: {
+    getIsCheck(e){
+      console.log(e)
+      this.isCheck=!this.isCheck
+    },
+    changeIsSetPassWord(){
+      this.isSetPassWord = !this.isSetPassWord;
+      // 未勾选时直接清除缓存
+      if (!this.isSetPassWord) {
+        wx.removeStorageSync('rememberedUser');
+      }
+    },
+    changeIsPassWord(){
+      this.isPassWord=!this.isPassWord
+      console.log(123123)
+    },
     async wxlogin() {
       let _this = this;
       wx.login({
@@ -160,6 +210,17 @@ export default {
       };
       login(loginForm).then((res) => {
         if (res.errmsg == "成功") {
+          if (_this.isSetPassWord) {
+            // 存储账号、原始密码（未加密）、勾选状态
+            wx.setStorageSync('rememberedUser', {
+              userName: _this.loginForm.userName,
+              password: _this.loginForm.password, // 存原始密码，避免重复加密
+              isSetPassWord: true
+            });
+          } else {
+            // 未勾选则清除缓存
+            wx.removeStorageSync('rememberedUser');
+          }
           uni.showToast({
             title: "登录成功",
             icon: "none",
@@ -326,12 +387,15 @@ export default {
     text-align: center;
     color: #999999;
     font-size: 2vw;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 
-  @media screen and (max-height: 454px) {
-    .bottomTips {
-      display: none;
-    }
-  }
+  //@media screen and (max-height: 454px) {
+  //  .bottomTips {
+  //    display: none;
+  //  }
+  //}
 }
 </style>

pages/mine/mine.vue

@@ -161,7 +161,7 @@ export default {
           if (res.confirm) {
             uni.clearStorageSync();
             uni.reLaunch({
-              url: "/pages/chooseIdentity/index",
+              url: "/pages/login/login",
             });
           }
         },

pages/subPackages/carmange/add.vue

@@ -81,7 +81,7 @@
     </div>
   </div>
 </template>
-  
+
   <script>
 import CarNumber from "@/components/codecook-carnumber/codecook-carnumber.vue";
 import { getUserLocalStorageInfo } from "@/js_sdk/localUserInfo.js";
@@ -92,6 +92,7 @@ export default {
     return {
       formData: {},
       carNo: "",
+
     };
   },
   components: {
@@ -105,6 +106,18 @@ export default {
     this.againGetData();
   },
   methods: {
+    validateCarNo(carNo) {
+      // 规则1：普通车牌号规则
+      const carNoRule1 = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-HJ-NP-Z]{1}([A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}|[A-HJ-NP-Z0-9]{5,6})$/;
+
+      // 规则2：新能源车牌号规则
+      const carNoRule2 = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-HJ-NP-Z]{1}(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))$/;
+      console.log(carNoRule1.test(carNo))
+      console.log(carNoRule2.test(carNo))
+
+      // 任意一个规则匹配成功即返回 true
+      return carNoRule1.test(carNo) || carNoRule2.test(carNo);
+    },
     againGetData() {
       let formData = { ...this.formData };
       this.formData = {};
@@ -115,6 +128,10 @@ export default {
         this.$showToast("请填写车牌号");
         return;
       }
+      if(!this.validateCarNo(this.carNo)){
+        this.$showToast("请检查车牌号格式是否正确");
+        return
+      }
       if (!this.formData.driverName || this.formData.driverName.length == 0) {
         this.$showToast("请填写司机姓名");
         return;
@@ -140,7 +157,7 @@ export default {
   },
 };
 </script>
-  
+
   <style lang="scss">
 .add_car {
   .foot-btn {
@@ -285,4 +302,4 @@ export default {
     border-bottom: 2rpx #e6e6e6 solid;
   }
 }
-</style>
+</style>

pages/subPackages/choosecar/index.vue

@@ -2,13 +2,13 @@
   <div class="choosecar">
     <img
       class="banner"
-      src="https://www.idea-sf.com/dockPic/choosecar/banner.png"
+      src="https://wxdock.astrazeneca.cn/dockPic/choosecar/banner.png"
       alt=""
     />
     <div class="carlist">
       <div class="list-row1" @click="jummPage(item)" v-for="item in list">
         <img
-          src="https://www.idea-sf.com/dockPic/choosecar/car1.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/choosecar/car1.png"
           class="carimg"
           alt=""
         />
@@ -17,42 +17,42 @@
           <div class="row-tip">适用{{ item.label }}预约</div>
         </div>
         <img
-          src="https://www.idea-sf.com/dockPic/choosecar/jiantou.png"
+          src="https://wxdock.astrazeneca.cn/dockPic/choosecar/jiantou.png"
           alt=""
           class="jiantou"
         />
       </div>
       <!-- <div class="list-row1" @click="jummPage()">
-        <img src="https://www.idea-sf.com/dockPic/choosecar/car2.png" class="carimg" alt="" />
+        <img src="https://wxdock.astrazeneca.cn/dockPic/choosecar/car2.png" class="carimg" alt="" />
         <div style="margin-left: 28rpx">
           <div class="row-title">大型箱车</div>
           <div class="row-tip">适用普通车辆预约 工作时间为 8:30~16:30</div>
         </div>
-        <img src="https://www.idea-sf.com/dockPic/choosecar/jiantou.png" alt="" class="jiantou" />
+        <img src="https://wxdock.astrazeneca.cn/dockPic/choosecar/jiantou.png" alt="" class="jiantou" />
       </div>
       <div class="list-row1" @click="jummPage()">
-        <img src="https://www.idea-sf.com/dockPic/choosecar/car3.png" class="carimg" alt="" />
+        <img src="https://wxdock.astrazeneca.cn/dockPic/choosecar/car3.png" class="carimg" alt="" />
         <div style="margin-left: 28rpx">
           <div class="row-title">集装箱车辆</div>
           <div class="row-tip">适用集装箱车辆预约 工作时间为 8:00~17:00</div>
         </div>
-        <img src="https://www.idea-sf.com/dockPic/choosecar/jiantou.png" alt="" class="jiantou" />
+        <img src="https://wxdock.astrazeneca.cn/dockPic/choosecar/jiantou.png" alt="" class="jiantou" />
       </div>
       <div class="list-row1" @click="jummPage()">
-        <img src="https://www.idea-sf.com/dockPic/choosecar/car4.png" class="carimg" alt="" />
+        <img src="https://wxdock.astrazeneca.cn/dockPic/choosecar/car4.png" class="carimg" alt="" />
         <div style="margin-left: 28rpx">
           <div class="row-title">航空箱</div>
           <div class="row-tip">适用普通车辆预约 工作时间为 8：30~16：30</div>
         </div>
-        <img src="https://www.idea-sf.com/dockPic/choosecar/jiantou.png" alt="" class="jiantou" />
+        <img src="https://wxdock.astrazeneca.cn/dockPic/choosecar/jiantou.png" alt="" class="jiantou" />
       </div>
       <div class="list-row1" @click="jummPage()">
-        <img src="https://www.idea-sf.com/dockPic/choosecar/car5.png" class="carimg" alt="" />
+        <img src="https://wxdock.astrazeneca.cn/dockPic/choosecar/car5.png" class="carimg" alt="" />
         <div style="margin-left: 28rpx">
           <div class="row-title">海运柜</div>
           <div class="row-tip">适用普通车辆预约 工作时间为 8:30~16:30</div>
         </div>
-        <img src="https://www.idea-sf.com/dockPic/choosecar/jiantou.png" alt="" class="jiantou" />
+        <img src="https://wxdock.astrazeneca.cn/dockPic/choosecar/jiantou.png" alt="" class="jiantou" />
       </div> -->
     </div>
   </div>

pages/subPackages/czlc/gonggaoCzlc.vue

@@ -0,0 +1,25 @@
+<template>
+  <div class="qy_yy_edit">
+    <img src="https://wxdock.astrazeneca.cn/dockPic/sjCzlcImg/gonggaoCzlc.png" alt="" style="height: 3828rpx;width: 750rpx">
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+
+    };
+  },
+
+
+};
+</script>
+
+<style lang="scss">
+.qy_yy_edit {
+
+}
+</style>

pages/subPackages/czlc/sjCzlc.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="sjCzlc">
+    <img src="https://wxdock.astrazeneca.cn/dockPic/sjCzlcImg/sjCzlcImg.png" alt="" style="height: 3240rpx;width: 750rpx">
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+
+    };
+  },
+
+
+};
+</script>
+
+<style lang="scss">
+.sjCzlc {
+
+}
+</style>

pages/subPackages/noticeList/qy.vue

@@ -12,7 +12,7 @@
     >
       <img src="./1.png" alt="" style="width: 80rpx; height: 80rpx" />
       <div class="lefttext">
-        <div :class="item.userReadStatus ? 'text' : 'text fwbold'">
+        <div :class="item.bizReadStatus ? 'text ' : 'text fwbold'">
           {{ item.messageContent }}
         </div>
         <div class="text1">{{ item.createTime }}</div>
@@ -40,12 +40,18 @@ export default {
     this.bizMessageListPage();
   },
   onLoad() {
-    (this.searchData.bizId = getUserLocalStorageInfo().biz.id),
+    this.searchData.bizId = getUserLocalStorageInfo().biz.id
       this.bizMessageListPage();
     // userId: getUserLocalStorageInfo().user.id,
   },
+  onShow(){
+    this.bizMessageListPage();
+
+  },
   methods: {
     async jumpPage(path, id) {
+      // console.log(id)
+      // return
       let data = await bizReadMessage({ id });
       console.log(path);
       uni.navigateTo({
@@ -54,6 +60,7 @@ export default {
       });
     },
     async bizMessageListPage() {
+      this.list=[]
       let { data } = await bizMessageListPage(this.searchData);
       if (this.list.length != data.total) {
         this.list.push(...data.list);
@@ -67,12 +74,13 @@ export default {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
+  .fwbold {
+    font-weight: bold!important;
+  }
   .list-row {
     width: 606rpx;
     background: #ffffff;
-    .fwbold {
-      font-weight: bold;
-    }
+
     .lefttext {
       margin-left: 12rpx;
       .text {
@@ -90,4 +98,4 @@ export default {
     }
   }
 }
-</style>
+</style>

pages/subPackages/password/index.vue

@@ -54,7 +54,7 @@
     </div>
   </div>
 </template>
-  
+
   <script>
 import {
   editBizPassword,
@@ -108,14 +108,15 @@ export default {
         return false;
       }
       if (getUserLocalStorageInfo().userType == "BIZ") {
-        console.log(getUserLocalStorageInfo().userType);
         editBizPassword({
           // w_md5.hex_md5_32
           id: getUserLocalStorageInfo().user.id,
           newPassword: w_md5.hex_md5_32(this.password),
           oldPassword: w_md5.hex_md5_32(this.lastPassword),
         }).then((res) => {
-          if (res.errno === 0 && res.data) {
+          console.log(res)
+
+          if (res.errno === 0 && res.errmsg) {
             uni.clearStorageSync();
             uni.reLaunch({
               url: "/pages/login/login",
@@ -134,7 +135,7 @@ export default {
           newPassword: w_md5.hex_md5_32(this.password),
           oldPassword: w_md5.hex_md5_32(this.lastPassword),
         }).then((res) => {
-          if (res.errno === 0 && res.data) {
+          if (res.errno === 0 && res.errmsg) {
             uni.clearStorageSync();
             uni.reLaunch({
               url: "/pages/login/login",
@@ -153,7 +154,7 @@ export default {
           newPassword: w_md5.hex_md5_32(this.password),
           oldPassword: w_md5.hex_md5_32(this.lastPassword),
         }).then((res) => {
-          if (res.errno === 0 && res.data) {
+          if (res.errno === 0 && res.errmsg) {
             uni.clearStorageSync();
             uni.reLaunch({
               url: "/pages/login/login",
@@ -244,4 +245,3 @@ export default {
   }
 }
 </style>
-  

pages/subPackages/phoneRegister/index.vue

@@ -16,7 +16,7 @@
     </div>
     <div class="bottomTips">
       <label class="radio">
-        <radio value="r1" checked="true" color="#8a0554" />
+        <radio value="r1" :checked="ischeck" color="#8a0554" />
         已阅读并同意<span style="color: #8a0554"
           >《服务协议条款及隐私政策》</span
         >
@@ -31,6 +31,7 @@ import { loginByWeChat } from "@/js_sdk/http.js";
 export default {
   data() {
     return {
+      ischeck:false,
       loginForm: {
         userName: "",
         password: "",

pages/subPackages/qy_yy/index.vue

@@ -5,48 +5,57 @@
         <span class="form-requird">*</span>
         <span>供应商</span>
       </div>
-      <div @click="oepnGysPopup()">
+      <div @click="oepnGysPopup()" style="font-size: 28rpx">
         {{ form.gysName ? form.gysName : "请选择" }}
       </div>
     </div>
-    <div class="form bd_bottom pdt32 pdb32" style="display: block">
-      <div class="form-label">
-        <span class="form-requird">*</span>
-        <span>车牌号</span>
-      </div>
-      <div>
-        <car-number ref="carNum" v-model="carNumber"></car-number>
-      </div>
-    </div>
+
     <div class="form bd_bottom">
       <div class="form-label">
         <span class="form-requird">*</span>
-        <span>常用车辆</span>
+        <span>选择车辆</span>
       </div>
-      <div class="form-value" style="min-width: 435rpx; width: auto">
+      <div class="form-value" style="min-width: 435rpx; width: auto;font-size: 28rpx">
         <picker
-          @change="selectUsedCar"
-          :value="index"
-          :range="usedCarList"
-          range-key="label"
+            @change="selectUsedCar"
+            :value="index"
+            :range="usedCarList"
+            range-key="label"
         >
           <!-- <view class="uni-input">{{ array[index] }}</view> -->
           {{ usedCar ? usedCar : "请选择" }}
         </picker>
       </div>
       <van-icon name="arrow" />
+      <span style="color: #8A0554" @click="jumpPage('/pages/subPackages/carmange/add')">
+                <van-icon
+                    size="48rpx"
+                    color="#8A0554"
+                    name="add"
+                />
+      </span>
+    </div>
+    <div class="form bd_bottom pdt32 pdb32" style="display: block">
+      <div class="form-label">
+        <span class="form-requird">*</span>
+        <span>车牌号</span>
+
+      </div>
+      <div>
+        <car-number :disable="false" ref="carNum" v-model="carNumber"></car-number>
+      </div>
     </div>
     <div class="form bd_bottom">
       <div class="form-label">
         <span class="form-requird">*</span>
         <span>车辆类型</span>
       </div>
-      <div class="form-value">
+      <div class="form-value" style="font-size: 28rpx">
         <picker
-          @change="selectCarType"
-          :value="index"
-          :range="dockCarTypeList"
-          range-key="label"
+            @change="selectCarType"
+            :value="index"
+            :range="dockCarTypeList"
+            range-key="label"
         >
           <!-- <view class="uni-input">{{ array[index] }}</view> -->
           {{ form.carType ? form.carType : "请选择" }}
@@ -62,10 +71,10 @@
         </div>
         <div class="form-value">
           <input
-            type="text"
-            readonly
-            placeholder="请选择"
-            v-model="form.driverName"
+              type="text"
+              readonly
+              placeholder="请选择"
+              v-model="form.driverName"
           />
         </div>
       </div>
@@ -78,10 +87,10 @@
         </div>
         <div class="form-value">
           <input
-            type="text"
-            readonly
-            placeholder="请选择"
-            v-model="form.driverUsername"
+              type="text"
+              readonly
+              placeholder="请选择"
+              v-model="form.driverUsername"
           />
         </div>
       </div>
@@ -101,7 +110,7 @@
         <span>件数/托盘数：</span>
       </div>
       <div>
-        <input type="text" placeholder="请输入" v-model="form.loadNum" />
+        <input type="number" placeholder="请输入" v-model="form.loadNum" />
       </div>
     </div>
     <div class="form bd_bottom" v-if="mtId">
@@ -122,14 +131,14 @@
     <div class="bottom-form mt32">
       <div class="mt-select">
         <div
-          class="select-item"
-          :style="{
+            class="select-item"
+            :style="{
             background: item.value == mtId ? '#8A0554' : '#f5f7fa',
             color: item.value == mtId ? 'white' : 'black',
           }"
-          v-for="item in mtList"
-          @click="getMtId(item)"
-          :key="item.value"
+            v-for="item in mtList"
+            @click="getMtId(item)"
+            :key="item.value"
         >
           {{ item.label }}
         </div>
@@ -139,57 +148,66 @@
           <span style="color: red">*</span>
           可选时间
         </div>
-        <div class="legend">
-          <div class="white-legend"></div>
-          <div>可选</div>
-        </div>
-        <div class="legend">
-          <div class="purple-legend"></div>
-          <div>已占用</div>
-        </div>
-        <div class="legend">
-          <div class="ysd-legend"></div>
-          <div>已锁定</div>
+        <div style="display: flex;flex-wrap: wrap;margin-top: 32rpx">
+          <div class="legend">
+            <div class="white-legend"></div>
+            <div>可选</div>
+          </div>
+          <div class="legend">
+            <div class="purple-legend"></div>
+            <div>占用</div>
+          </div>
+          <div class="legend">
+            <div class="ysd-legend"></div>
+            <div>锁定</div>
+          </div>
+          <div class="legend">
+            <div class="yxz-legend"></div>
+            <div>选中</div>
+          </div>
         </div>
       </div>
+<!--      isSeletStyle-->
       <div class="sj-select">
         <div
-          :class="
-            item.statusStr == '已预约'
+            :class="
+              form.dockSettingDetailId == item.dockSettingDetailId &&
+              form.dockSettingId == item.dockSettingId &&
+              form.timeEnd == item.timeEnd &&
+              form.timeStart == item.timeStart
+              ?'select-item isSeletStyle'
+              :item.statusStr == '已预约'
               ? 'select-item yyyStatus'
               : item.statusStr == '已锁定'
               ? 'select-item ysdStatus'
               : 'select-item '
           "
-          @click="timeSelect(item)"
-          v-for="item in kxTimeList"
+            @click="timeSelect(item)"
+            v-for="item in kxTimeList"
         >
           {{ item.timeStart }}~{{ item.timeEnd }}
-          <van-icon
-            name="success"
-            v-if="
-              form.dockSettingDetailId == item.dockSettingDetailId &&
-              form.dockSettingId == item.dockSettingId &&
-              form.timeEnd == item.timeEnd &&
-              form.timeStart == item.timeStart
-            "
-          />
+<!--          <van-icon-->
+<!--              name="success"-->
+<!--              v-if="-->
+
+<!--            "-->
+<!--          />-->
         </div>
       </div>
 
       <div class="foot-btn">
         <van-button
-          color="rgba(0, 0, 0, 0.05)"
-          type="default"
-          class="cancel"
-          @click="cancelYY"
+            color="rgba(0, 0, 0, 0.05)"
+            type="default"
+            class="cancel"
+            @click="cancelYY"
         >
           返回
         </van-button>
         <van-button
-          color="rgba(138, 5, 84, 1)"
-          type="primary"
-          @click="submitReservationByBiz()"
+            color="rgba(138, 5, 84, 1)"
+            type="primary"
+            @click="submitReservationByBiz()"
         >
           提交
         </van-button>
@@ -222,7 +240,6 @@ export default {
       dockCarTypeList: [],
       form: {},
       mtList: [],
-      yydateList: [],
       mtId: "",
       yydateList: [],
       usedCarList: [],
@@ -244,7 +261,17 @@ export default {
     this.againRenderData();
     this.getCarDataByBiz();
   },
+  onShow(){
+    this.getCarDataByBiz()
+  },
   methods: {
+    jumpPage(path) {
+      console.log(path);
+      uni.navigateTo({
+        url: path,
+        fail: (fail) => {},
+      });
+    },
     cancelYY() {
       uni.navigateBack();
     },
@@ -292,7 +319,8 @@ export default {
       });
       if (res.errmsg == "成功") {
         this.$showToast("预约成功");
-        uni.navigateBack({ delta: 2 });
+        this.jumpPage('/pages/subPackages/yy_history/index')
+        // uni.navigateBack({ delta: 2 });
       }
       console.log(res);
     },
@@ -319,7 +347,7 @@ export default {
     selectUsedCar({ detail }) {
       console.log(detail.value);
       let usedCarList = JSON.parse(
-        JSON.stringify(this.usedCarList[detail.value])
+          JSON.stringify(this.usedCarList[detail.value])
       );
       console.log(usedCarList);
       this.form.driverName = usedCarList.driver_name;
@@ -391,6 +419,7 @@ export default {
         loadType: this.form.loadType.replace("预约", ""),
       });
       this.mtList = data;
+      await this.getMtId(this.mtList[0])
     },
     againRenderData() {
       let form = { ...this.form };
@@ -407,6 +436,10 @@ export default {
     background: #8e8be4 !important;
     color: white;
   }
+  .isSeletStyle{
+    background: #2ab217 !important;
+    color: white;
+  }
   .ysdStatus {
     background: #ededed !important;
     color: #333333;
@@ -416,9 +449,13 @@ export default {
     margin-bottom: 32rpx;
     display: flex;
     justify-content: space-around;
+    button {
+      width: 30vw;
 
+    }
     .cancel {
       button {
+        //width: 30vw;
         color: rgba(138, 5, 84, 1) !important;
       }
     }
@@ -441,6 +478,7 @@ export default {
       text-align: center;
       line-height: 80rpx;
       width: 225rpx;
+      font-size: 32rpx;
       height: 80rpx;
       background: rgba(255, 255, 255, 1);
       border-radius: 0rpx 0rpx 0rpx 0rpx;
@@ -458,7 +496,7 @@ export default {
 
   .sj-select-title {
     flex-wrap: wrap;
-    display: flex;
+    //display: flex;
     align-items: center;
 
     .legend {
@@ -486,6 +524,13 @@ export default {
       background: #ededed;
       border-radius: 0rpx 0rpx 0rpx 0rpx;
     }
+    .yxz-legend {
+      margin-right: 16rpx;
+      width: 28rpx;
+      height: 28rpx;
+      background: #2ab217;
+      border-radius: 0rpx 0rpx 0rpx 0rpx;
+    }
     .purple-legend {
       margin-right: 16rpx;
       width: 28rpx;
@@ -577,4 +622,4 @@ export default {
     border-bottom: 2rpx #e6e6e6 solid;
   }
 }
-</style>
+</style>

pages/subPackages/yy_history/code.vue

@@ -39,6 +39,10 @@
           <div class="item-label">预约日期</div>
           <div class="item-value">{{ info.reservationDate }}</div>
         </div>
+        <div class="form-item">
+          <div class="item-label">预约时段</div>
+          <div class="item-value">{{ info.timeStart }}~{{ info.timeEnd }}</div>
+        </div>
         <div class="form-item">
           <div class="item-label">所属企业</div>
           <div class="item-value">{{ info.businessName }}</div>
@@ -63,6 +67,7 @@
           <div class="item-label">预约日期</div>
           <div class="item-value">{{ info.reservationDate }}</div>
         </div>
+
         <div class="form-item">
           <div class="item-label">签到日期</div>
           <div class="item-value">
@@ -81,6 +86,12 @@
             {{ info.finishTime ? info.finishTime : "暂无数据" }}
           </div>
         </div>
+        <div class="form-item">
+          <div class="item-label" >到场流程</div>
+          <div class="item-value" style="color: #8A0554;font-weight: bold" @click="jumpPage()">
+            到场流程
+          </div>
+        </div>
       </div>
     </div>
     <div class="form share" style="margin-top: 24rpx">
@@ -134,6 +145,12 @@ export default {
     }
   },
   methods: {
+    jumpPage(){
+      uni.navigateTo({
+        url: '/pages/subPackages/czlc/sjCzlc',
+        fail: (fail) => {},
+      });
+    },
     async getReservationVoById(id) {
       let { data } = await getReservationVoById({ id });
       console.log(data);

pages/subPackages/yy_history/index.vue

@@ -137,10 +137,10 @@ export default {
       list: [],
     };
   },
-  onLoad() {
+  onShow() {
     // console.log(getUserLocalStorageInfo().user.id);
     this.searchData.bizId = getUserLocalStorageInfo().biz.id;
-
+    this.list = [];
     this.reservationBizListPage();
   },
   onReachBottom() {
@@ -204,6 +204,7 @@ export default {
       // 预约日期的当天八点时间戳
       // console.log(Date.now() < timestamp && status == 0);
       // console.log(timestamp);
+      console.log(Date.now() < timestamp && status == 0)
       if (Date.now() < timestamp && status == 0) {
         return true;
       }
@@ -299,4 +300,4 @@ export default {
     }
   }
 }
-</style>
+</style>

pages/utils/constant.js

@@ -1,5 +1,6 @@
 // 系统常量
-export const BASE_URI = "https://www.idea-sf.com/dockApi"; // 测试
+export const  BASE_URI= 'https://wxdock.astrazeneca.cn/dockApi'
+// export const BASE_URI = "https://www.idea-sf.com/dockApi"; // 测试
 // export const BASE_URI = "http://192.168.2.108:9001"; // 许峰本地
 
 // export const BASE_URI = "https://hswkxc.idea-sf.com/gardenApi"; // 正式
@@ -11,7 +12,7 @@ export const BASE_URI = "https://www.idea-sf.com/dockApi"; // 测试
 
 export default {
     /* 系统常量*/
-    // 基础地址
+    // 基础地址 q
     BASE_URI,
 
 };