app相关修改

src/common/api/ajax.js

@@ -206,9 +206,9 @@ const http = {
                     }
                 }
             } else if (response.statusCode === 401) {
-                await plugin.getToken()
-                data = await self.ajax(request[0], request[1], request[2], request[3])
-                // router.replace('/pages/index/login');
+                // await plugin.getToken()
+                // data = await self.ajax(request[0], request[1], request[2], request[3])
+                router.replace('/pages/index/login');
             } else {
                 console.error(response.data)
             }

src/common/js/poster.js

@@ -127,7 +127,6 @@ export default {
             // 背景
             ctx.setFillStyle("#fff");
             ctx.fillRect(0, 0, 750, canvasH);
-            console.log(resList);
             // 顶图
             if (resList[0][1].path) {
                 ctx.drawImage(resList[0][1].path, bgTop.x, bgTop.y, bgTop.w, bgTop.h);

src/components/easy-upload/easy-upload-media.vue

@@ -27,12 +27,12 @@
                         :src="upload"
                         controls
                     >
-                        <cover-image
+                        <image
                             v-if="types == 'video'"
                             class="clear-one-icon"
                             :src="respath + 'static/icon/close.png'"
                             @tap="delImage(index)"
-                        ></cover-image>
+                        ></image>
                     </video>
                 </view>
             </block>
@@ -431,6 +431,7 @@ export default {
             //#ifdef APP-PLUS
             return "";
             //#endif
+            return "/";
         },
     },
 };

src/components/easy-upload/easy-upload.vue

@@ -13,7 +13,7 @@
                     <image
                         v-if="types == 'image'"
                         class="clear-one-icon"
-                        :src="respath+'static/icon/close.png'"
+                        :src="'/static/icon/close.png'"
                         @tap="delImage(index)"
                     ></image>
                     <view class="load-box" v-if="viewLoading(upload)">
@@ -27,12 +27,12 @@
                         :src="upload"
                         controls
                     >
-                        <cover-image
+                        <image
                             v-if="types == 'video'"
                             class="clear-one-icon"
                         :src="respath+'static/icon/close.png'"
                             @tap="delImage(index)"
-                        ></cover-image>
+                        ></image>
                     </video>
                 </view>
             </block>
@@ -126,7 +126,6 @@ export default {
     watch: {
         value: {
             handler(val) {
-                console.log(2222, val);
                 this.uploads = val;
             },
         },
@@ -422,6 +421,8 @@ export default {
             //#ifdef APP-PLUS
             return "";
             //#endif
+            
+            return "/";
         },
     },
 };
@@ -469,6 +470,7 @@ export default {
     top: 0;
     right: 0;
     z-index: 9;
+	background-color: red;
 }
 .uploader-input-box {
     position: relative;

src/components/layout/nav.vue

@@ -73,6 +73,7 @@
             //#ifdef APP-PLUS
             return '';
             //#endif
+            return '/';
         }
         },
 

src/manifest.json

@@ -1,7 +1,7 @@
 {
     "name" : "配送助手",
     "appid" : "__UNI__EBBC677",
-    "description" : "",
+    "description" : "线下商超配送助手",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
@@ -14,42 +14,84 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {},
+        "modules" : {
+            "OAuth" : {}
+        },
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
             "android" : {
                 /* android打包配置 */
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
             "ios" : {},
             /* ios打包配置 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wxda6414f3c83f2378",
+                        "appsecret" : "",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "geolocation" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
             }
         }
     },

src/pages/index/index-scan.vue

@@ -2,7 +2,7 @@
     <div class="page">
         <div class="page__top">
             <div class="name">当前门店：</div>
-            <div class="shop"  @click="goShopSelect">
+            <div class="shop" @click="goShopSelect">
                 <div class="shop__name">
                     <!-- 最多6字 -->
                     {{ curShopName }}
@@ -423,7 +423,7 @@
                         <div class="null" v-if="loading && !item.list.length">
                             <img
                                 class="null__img"
-                                :src="respath+'static/common/order_null.jpg'"
+                                :src="respath + 'static/common/order_null.jpg'"
                                 alt
                             />
                             <div class="null__title">还没有相关数据哦</div>
@@ -502,7 +502,7 @@ export default {
                     list: [],
                 },
             ],
-            vipCode:'',
+            vipCode: "",
             loading: false, // 是否加载完成
         };
     },
@@ -590,15 +590,21 @@ export default {
     onLoad(opts) {
         this.vipCode = opts.vipcode;
         // 判断权限
-        if (this.user.authStatus === 0) {
-            // 未注册
-            this.router.replace({
-                path: "/pages/manage/mina/register",
-            });
-        } else if (this.user.authStatus === 90) {
-            // 等待注册
+        if (this.user) {
+            if (this.user.authStatus === 0) {
+                // 未注册
+                this.router.replace({
+                    path: "/pages/manage/mina/register",
+                });
+            } else if (this.user.authStatus === 90) {
+                // 等待注册
+                this.router.replace({
+                    path: "/pages/manage/mina/query",
+                });
+            }
+        } else {
             this.router.replace({
-                path: "/pages/manage/mina/query",
+                path: "/pages/index/login",
             });
         }
     },
@@ -658,7 +664,7 @@ export default {
                     status: self.list[self.tab].status,
                     pageIndex: self.list[self.tab].page,
                     pageSize: 20,
-                    vipCode:this.vipCode,
+                    vipCode: this.vipCode,
                 })
                 .then((res) => {
                     uni.hideLoading();
@@ -688,7 +694,7 @@ export default {
                     status: self.list[self.tab].status,
                     pageIndex: self.list[self.tab].page,
                     pageSize: 20,
-                    vipCode:this.vipCode,
+                    vipCode: this.vipCode,
                 })
                 .then((res) => {
                     let data = res.data.data;

src/pages/index/index.vue

@@ -615,15 +615,21 @@ export default {
     },
     onLoad() {
         // 判断权限
-        if (this.user.authStatus === 0) {
-            // 未注册
-            this.router.replace({
-                path: "/pages/manage/mina/register",
-            });
-        } else if (this.user.authStatus === 90) {
-            // 等待注册
+        if (this.user) {
+            if (this.user.authStatus === 0) {
+                // 未注册
+                this.router.replace({
+                    path: "/pages/manage/mina/register",
+                });
+            } else if (this.user.authStatus === 90) {
+                // 等待注册
+                this.router.replace({
+                    path: "/pages/manage/mina/query",
+                });
+            }
+        } else {
             this.router.replace({
-                path: "/pages/manage/mina/query",
+                path: "/pages/index/login",
             });
         }
     },

src/pages/index/login.vue

@@ -46,7 +46,6 @@ export default {
     // 函数
     methods: {
         submit() {
-            console.log(this.mobile);
             if (!this.userName) {
                 this.fn.showToast(`请输入账号`);
                 return;
@@ -70,6 +69,7 @@ export default {
                         })
                         .then((res) => {
                             uni.hideLoading();
+								console.log(res);
 
                             if (res.success) {
                                 // 判断权限

src/pages/manage/poster/index.vue

@@ -19,7 +19,7 @@
 
         <div
             class="canvas"
-            v-show="canvasShow"
+            v-if="canvasShow"
             @touchmove.stop=""
             @click="closeCanvas"
         >