合并

java-mall-app-shop-admin/.gitignore

@@ -1,5 +1,8 @@
 .DS_Store
 node_modules/
+/unpackage/*
+unpackage/
+/unpackage/
 /dist
 /admin/
 # local env files

java-mall-app-shop-admin/App.vue

@@ -2,7 +2,6 @@
 // #ifdef APP-PLUS
 import APPUpdate, { getCurrentNo } from "@/config/appUpdate";
 // #endif
-import { GetAPPversion } from "@/api/checkAPPupdate";
 
 export default {
   data() {

java-mall-app-shop-admin/manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__95F809F",
     "package" : "com.xiaofa.shopAdmin",
     "description" : "",
-    "versionName" : "1.0.1",
+    "versionName" : "1.0.0",
     "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */

java-mall-app-shop-admin/pages.json

@@ -15,7 +15,7 @@
     {
       "path": "pages/audit/shop1",
       "style": {
-        "navigationStyle": "custom"
+        "navigationBarTitleText": "填写店铺信息第1步/共3步"
       }
     },
     {

java-mall-app-shop-admin/pages/audit/mapAddress.vue

@@ -13,6 +13,7 @@
           class="form-input city-input"
           v-model="form.administrativeRegion"
           placeholder="请先选择省市区"
+          border="none"
         />
         <u-icon
           slot="right"

java-mall-app-shop-admin/pages/audit/shop1.vue

@@ -1,14 +1,5 @@
 <template>
   <view class="shop-1-container">
-    <u-navbar
-      :autoBack="true"
-      :safeAreaInsetTop="true"
-      title="填写店铺信息第1步/共3步"
-    >
-      <template slot="right">
-        <view class="btn-register" @click="LoginOut">退出登录</view>
-      </template>
-    </u-navbar>
     <!-- <u-loading-page
       :loading="showLodingPage"
       font-size="18"
@@ -79,7 +70,7 @@
       </u-form-item>
       <u-form-item label="门脸图" prop="storefrontImg">
         <u-upload
-          :class="fileList.length == 0 ? 'shop1-upload' : ''"
+          :class="fileList.length == 0 ? 'shop1-upload' : 'shop1-upload-item'"
           @afterRead="afterRead1"
           @delete="deletePic1"
           accept="image"
@@ -93,7 +84,7 @@
       </u-form-item>
       <u-form-item label="环境图" prop="surroundingsImg">
         <u-upload
-          :class="fileList2.length == 0 ? 'shop2-upload' : ''"
+          :class="fileList2.length == 0 ? 'shop2-upload' : 'shop2-upload-item'"
           @afterRead="afterRead2"
           @delete="deletePic2"
           accept="image"
@@ -114,7 +105,6 @@
 </template>
 <script>
 import { UploadFilePromise } from "../../api/upload";
-import { mapActions } from "vuex";
 export default {
   data() {
     return {
@@ -193,14 +183,13 @@ export default {
     this.$refs["uForm"].setRules(this.rules);
   },
   methods: {
-    ...mapActions("user", ["LoginOut"]),
     async afterRead1(e) {
       const item = e.file;
       const imgUrl = item.url;
-
       const group = {
         url: imgUrl,
       };
+
       this.fileList.push(group);
 
       let res = await UploadFilePromise(imgUrl);
@@ -338,6 +327,20 @@ export default {
       }
     }
 
+    /deep/.shop1-upload-item {
+      .u-upload__wrap {
+        flex-direction: column !important;
+        flex-wrap: nowrap !important;
+      }
+    }
+
+    /deep/.shop2-upload-item {
+      .u-upload__wrap {
+        flex-direction: column !important;
+        flex-wrap: nowrap !important;
+      }
+    }
+
     /deep/.shop2-upload {
       .u-upload__button {
         // background: url("../../static/shenhe-bg1.png");

java-mall-app-shop-admin/store/modules/user.js

@@ -1,4 +1,5 @@
 import { GetLogin, GetSmsCode, GetAccountLogin } from '../../api/login';
+import { GetAuditInfo } from '../../api/audit';
 import { GetAuditStatus } from '../../api/audit';
 // import $cookies from '../../utils/vue-cookies'
 
@@ -47,10 +48,6 @@ const actions = {
 
       const result = await GetAuditStatus({ mobile: mobile });
 
-      if (result && result.status == 200) {
-        res.data.merch_approval_status = result.data.approval_status;
-      }
-
       const userInfo = res.data;
       const auditStatusInfo = result.data;
 
@@ -191,6 +188,53 @@ const actions = {
       },
     });
   },
+  async checkAccountIsPass(mobile) {
+    let res = await GetAuditStatus({ mobile: mobile });
+    if (res && res.status == 200) {
+      let { approval_status, signed_status, store_status } = res.data;
+
+      //2-未通过；3-待审核；4-未申请过；5-已提交审核；'
+      if ([2, 3, 4, 5].includes(approval_status)) {
+        uni.navigateTo({
+          url: '/pages/audit/checkAudit',
+        });
+        return;
+      }
+
+      if (signed_status != 2) {
+        uni.navigateTo({
+          url: '/pages/audit/checkAudit',
+        });
+        return;
+      }
+      // 合同签署状态：
+      // -1：预备数据阶段；0-等待签署；1-已部分签署；
+      // 2 - 已完成（所有签署方完成签署）3 - 已撤销（发起方撤销签署任务）
+      // 5 - 已过期（签署截止日到期后触发）7 - 已拒签（签署方拒绝签署）',
+      if (store_status != 1) {
+        uni.navigateTo({
+          url: '/pages/audit/checkAudit',
+        });
+        return;
+      }
+      //  store_status int   '店铺创建状态：1-已启用（入驻已审批，合同已生成）；2-未启用',
+      if (approval_status == 1 && signed_status == 2 && store_status == 1) {
+        let result = await GetAuditInfo();
+
+        uni.setStorageSync(
+          'contractDownloadUrl',
+          result.data.contract_download_url
+        );
+        uni.setStorageSync('auditId', result.data.id);
+        uni.setStorageSync('accountDashboard', result.data);
+
+        uni.switchTab({
+          url: '/pages/order/order',
+        });
+        return;
+      }
+    }
+  },
 };
 
 export default {

java-mall-app-shop-admin/unpackage/dist/dev/app-plus/app-config-service.js

@@ -0,0 +1,8 @@
+
+var isReady=false;var onReadyCallbacks=[];
+var isServiceReady=false;var onServiceReadyCallbacks=[];
+var __uniConfig = {"pages":["pages/index/index","pages/login/login","pages/audit/shop1","pages/audit/businessType","pages/audit/shop2","pages/audit/shop3","pages/audit/checkAudit","pages/audit/mapAddress","pages/agreement/agreement","pages/register/register","pages/forgetPassword/forgetPassword","pages/order/order","pages/IM/IM","pages/IM/IMmsgContent","pages/viewCenter/viewCenter","pages/manage/manage","pages/my/my","pages/my/shopInfo","pages/my/setting","pages/my/contract","pages/my/printer/printerList","pages/my/userInfo","pages/my/shopQRcode/shopQRcode","pages/my/protocol/protocol","pages/my/aboutUs/aboutUs","pages/my/aboutUs/records","pages/my/versions"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#FFFFFF","backgroundColor":"#FFFFFF","pageOrientation":"portrait","adjustPosition":true},"tabBar":{"color":"#000","selectedColor":"#4b71ff","borderStyle":"black","backgroundColor":"#ffffff","iconfontSrc":"/static/font/iconfont.ttf","fontSize":"14px","height":"58px","spacing":"5px","list":[{"pagePath":"pages/order/order","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"20px"},"text":"工作台"},{"pagePath":"pages/IM/IM","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"22px"},"text":"消息"},{"pagePath":"pages/viewCenter/viewCenter","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"20px"},"text":"视图中心"},{"pagePath":"pages/my/my","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"24px"},"text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"小发同城商家版","compilerVersion":"4.29","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/audit/shop1","meta":{},"window":{"navigationBarTitleText":"填写店铺信息第1步/共3步"}},{"path":"/pages/audit/businessType","meta":{},"window":{"navigationBarTitleText":"选择经营品类"}},{"path":"/pages/audit/shop2","meta":{},"window":{"navigationBarTitleText":"填写店铺信息第2步/共3步"}},{"path":"/pages/audit/shop3","meta":{},"window":{"navigationBarTitleText":"填写店铺信息第3步/共3步"}},{"path":"/pages/audit/checkAudit","meta":{},"window":{"navigationBarTitleText":"商户入驻申请"}},{"path":"/pages/audit/mapAddress","meta":{},"window":{"navigationBarTitleText":"选择地图地址"}},{"path":"/pages/agreement/agreement","meta":{},"window":{"navigationBarTitleText":"协议","style":{"navigationBarTitleText":"注册","navigationBarTextStyle":"white"}}},{"path":"/pages/register/register","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/forgetPassword/forgetPassword","meta":{},"window":{"navigationBarTitleText":"忘记密码"}},{"path":"/pages/order/order","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/IM/IM","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/IM/IMmsgContent","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/viewCenter/viewCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/manage/manage","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/my/my","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/my/shopInfo","meta":{},"window":{"navigationBarTitleText":"店铺信息"}},{"path":"/pages/my/setting","meta":{},"window":{"navigationBarTitleText":"设置"}},{"path":"/pages/my/contract","meta":{},"window":{"navigationBarTitleText":"合同"}},{"path":"/pages/my/printer/printerList","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/my/userInfo","meta":{},"window":{"navigationBarTitleText":"个人信息"}},{"path":"/pages/my/shopQRcode/shopQRcode","meta":{},"window":{"navigationBarTitleText":"店铺二维码"}},{"path":"/pages/my/protocol/protocol","meta":{},"window":{"navigationBarTitleText":"隐私协议"}},{"path":"/pages/my/aboutUs/aboutUs","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/my/aboutUs/records","meta":{},"window":{"navigationBarTitleText":"网址"}},{"path":"/pages/my/versions","meta":{},"window":{"navigationBarTitleText":"版本号"}}];
+__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
+__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
+service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

java-mall-app-shop-admin/unpackage/dist/dev/app-plus/manifest.json

@@ -0,0 +1 @@
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__95F809F","name":"小发同城商家版","version":{"name":"1.0.0","code":100},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Maps":{"coordType":"gcj02"},"Camera":{},"Record":{},"VideoPlayer":{},"UIWebview":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#FFFFFF"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"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"}}},"google":{"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.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.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{"privacyDescription":{"NSPhotoLibraryAddUsageDescription":"此App会在上传头像图片服务中访问您的相机权限","NSPhotoLibraryUsageDescription":"此App会在上传头像图片服务中访问您的相机权限","NSCameraUsageDescription":"此App会在上传头像图片服务中访问您的相机权限","NSMicrophoneUsageDescription":"此APP会在使用声音识别服务中使用您的麦克风权限","NSLocationWhenInUseUsageDescription":"此App会在使用导航服务中使用您的定位权限","NSLocationAlwaysUsageDescription":"此App会在使用导航服务中使用您的定位权限","NSLocationAlwaysAndWhenInUseUsageDescription":"此App会在使用导航服务中使用您的定位权限"},"dSYMs":false},"plugins":{"maps":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.29","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#000","selectedColor":"#4b71ff","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","iconfontSrc":"/static/font/iconfont.ttf","fontSize":"14px","height":"58px","spacing":"5px","list":[{"pagePath":"pages/order/order","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"20px"},"text":"工作台"},{"pagePath":"pages/IM/IM","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"22px"},"text":"消息"},{"pagePath":"pages/viewCenter/viewCenter","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"20px"},"text":"视图中心"},{"pagePath":"pages/my/my","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"24px"},"text":"我的"}]},"launch_path":"__uniappview.html"},"screenOrientation":["portrait-primary","portrait-secondary"]}