商户登录修改提交1.1.0.89

common/router/index.js

@@ -11,7 +11,7 @@ const router = new Router({
     routes: [...modules]//路由表
 });
 
-const whiteList = ['/pages/login/login','/pages/login/loginOauth2','/pages/login/xieyi','/pages/login/mimi','/pages/login/resetpassword','/pages/login/settled','/pages/login/register','/pages/login/map']
+const whiteList = ['/pages/login/login','/pages/login/loginOauth2','/pages/login/xieyi','/pages/login/mimi','/pages/login/resetpassword','/pages/login/settled','/pages/login/register','/pages/login/map','/pages/download/index']
 //全局路由前置守卫
 router.beforeEach((to, from, next) => {
 	if(to.path == '/oauth2-app/login'){

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.1.0.8",
-    "versionCode" : 1108,
+    "versionName" : "1.1.0.9",
+    "versionCode" : 1109,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages.json

@@ -369,8 +369,10 @@
 		},{
 			"path": "pages/product/creatStandard",
 			"style": {}
+		},{
+			"path": "pages/download/index",
+			"style": {}
 		}
-		
 	],
 	"globalStyle": {
 		"mp-alipay": {

pages/download/index.vue

@@ -0,0 +1,20 @@
+<template>
+  <view>
+    <web-view :src="url"></web-view>
+  </view>
+</template>
+<script>
+import configService from "@/common/service/config.service";
+
+export default {
+  name: "index",
+  data() {
+    return {
+      url: configService.apiUrl + '/downloadApp/download.html' // H5页面地址
+    };
+  }
+}
+</script>
+<style scoped lang="scss">
+
+</style>

pages/login/login.vue

@@ -322,7 +322,14 @@
       },
       //跳转到下载页面
       toLoginDown(){
+        // #ifdef APP-PLUS
+        uni.navigateTo({
+          url: '/pages/download/index'
+        });
+        // #endif
+        // #ifndef APP-PLUS
         window.location.href = configService.apiUrl + '/downloadApp/download.html';
+        // #endif
       },
 		},
 		beforeDestroy() {

pages/login/settled.vue

@@ -272,7 +272,7 @@
 		<view v-if="tab == 3" class="padding flex sub-bottom">
 			<button class="cu-btn round line-blue  shadow" @click="tab = 2">{{ title == '申请入驻' ? '上一步' : '上一页'
                 }}</button>
-			<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round "  v-throttle="sumbit">提交审核</button>
+			<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round "  @click="sumbit">提交审核</button>
 		</view>
 		<view class="cu-load load-modal" v-if="lodingshow">
 			<image src="/static/logo.png" mode="aspectFit"></image>
@@ -745,18 +745,20 @@ this.$forceUpdate();
               }
               console.log(this.form.headPhoto, 88);
               this.$http.post('/merchant/localMerchantInfo/edit/new', data).then(res => {
+                console.log(res.data.success, 11);
                 if (res.data.success) {
+				         	console.log(res.data.success, 99);
                   //放入session
                   const result = res.data.result
                   const userInfo = result.userInfo
+                  console.log(res.data.success)
                   uni.setStorageSync(ACCESS_TOKEN,result.token);
                   uni.setStorageSync(USER_INFO,userInfo);
                   this.$store.commit('SET_TOKEN', result.token)
                   this.$store.commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname})
                   this.$store.commit('SET_AVATAR', userInfo.avatar)
-                  this.$tip.success('登录成功!')
-                  this.$Router.replaceAll({
-                    name: 'index'
+                  uni.switchTab({
+                    url:'/pages/index/index'
                   })
                 } else {
                   this.$tip.error(res.data.message);
@@ -798,15 +800,38 @@ this.$forceUpdate();
                   //放入session
                   const result = res.data.result
                   const userInfo = result.userInfo
+                  uni.showToast({
+                    title: '111111！',
+                    icon: 'none'
+                  })
                   uni.setStorageSync(ACCESS_TOKEN,result.token);
                   uni.setStorageSync(USER_INFO,userInfo);
+                  uni.showToast({
+                    title: '222222222！',
+                    icon: 'none'
+                  })
                   this.$store.commit('SET_TOKEN', result.token)
                   this.$store.commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname})
                   this.$store.commit('SET_AVATAR', userInfo.avatar)
+                  uni.showToast({
+                    title: '44444444444444！',
+                    icon: 'none'
+                  })
+                  // #ifdef APP-PLUS
+                  uni.switchTab({
+                    url: '/pages/index/index'
+                  })
+                  // #endif
+                  // #ifndef APP-PLUS
                   this.$tip.success('登录成功!')
                   this.$Router.replaceAll({
                     name: 'index'
                   })
+                  // #endif
+                  uni.showToast({
+                    title: '888888888888888888！',
+                    icon: 'none'
+                  })
                 } else {
                   this.$tip.error(res.data.message);
                 }