hmp 4 years ago
parent
commit
c85a5694fe
3 changed files with 15 additions and 13 deletions
  1. 2 2
      assets/http/service.js
  2. 3 1
      pages/index/index.vue
  3. 10 10
      pages/shop-info/shop-info.vue

+ 2 - 2
assets/http/service.js

@@ -1,7 +1,7 @@
 import Request from 'luch-request'
 import Request from 'luch-request'
 
 
-// let baseURL = 'https://ldt.guosen-fumao.cn/api/'
-let baseURL = 'http://192.168.1.168:2366/'
+let baseURL = 'https://ldt.guosen-fumao.cn/api/'
+// let baseURL = 'http://192.168.1.168:2366/'
 
 
 let refreshTokenUrl = baseURL + "blade-auth/oauth/token"
 let refreshTokenUrl = baseURL + "blade-auth/oauth/token"
 
 

+ 3 - 1
pages/index/index.vue

@@ -238,6 +238,8 @@
 				this.labelNames = item.labelNames
 				this.labelNames = item.labelNames
 				this.mallId = item.mallId
 				this.mallId = item.mallId
 				this.cacheSelectedShop(item)
 				this.cacheSelectedShop(item)
+				
+				this.getTaskDetail()
 				this.handelShopStatus()
 				this.handelShopStatus()
 				//获取统计数据
 				//获取统计数据
 				this.getStatistic()
 				this.getStatistic()
@@ -262,7 +264,6 @@
 				this.$u.vuex('vuex_merchantNo', item.merchantNo)
 				this.$u.vuex('vuex_merchantNo', item.merchantNo)
 				this.$u.vuex('vuex_mallId', this.mallId)
 				this.$u.vuex('vuex_mallId', this.mallId)
 				this.$u.vuex('vuex_isOpenMember', item.isOpenMember == 1 ? true : false)
 				this.$u.vuex('vuex_isOpenMember', item.isOpenMember == 1 ? true : false)
-				this.getTaskDetail()
 			},
 			},
 			shopConfirm(e) {
 			shopConfirm(e) {
 				this.shopId = e[0].value
 				this.shopId = e[0].value
@@ -275,6 +276,7 @@
 				this.labelIds = item.labelIds
 				this.labelIds = item.labelIds
 				this.labelNames = item.labelNames
 				this.labelNames = item.labelNames
 				this.cacheSelectedShop(item[0])
 				this.cacheSelectedShop(item[0])
+				this.getTaskDetail()
 				this.handelShopStatus()
 				this.handelShopStatus()
 				//获取统计数据
 				//获取统计数据
 				this.getStatistic()
 				this.getStatistic()

+ 10 - 10
pages/shop-info/shop-info.vue

@@ -15,34 +15,34 @@
 			
 			
 			<u-form :model="form" :label-width="labelWidth" ref="uForm">
 			<u-form :model="form" :label-width="labelWidth" ref="uForm">
 				<view v-if="step==1" class="steps1" style="height: 900rpx;padding-bottom: 40rpx;">
 				<view v-if="step==1" class="steps1" style="height: 900rpx;padding-bottom: 40rpx;">
-					<view @click="clickType(0)" class="item u-border-bottom" style="margin-top: 40rpx;">
+					<view @click="clickType(1)" class="item u-border-bottom" >
 						<view class="flex">
 						<view class="flex">
 							<view class="center">
 							<view class="center">
-								<image class="icon" src="../../static/icon/shop1.png" mode=""></image>
+								<image class="icon" src="../../static/icon/shop2.png" mode=""></image>
 							</view>
 							</view>
 							<view class="item-content">
 							<view class="item-content">
-								<text>企业商户/个体工商户</text>
-								<text>企业商户,需提供营业执照,企业法人证件,企业对公结算银行账户,特殊行业还需提供生产经营许可证(例如:食品、化妆品、药品等)</text>
+								<text>小微商户</text>
+								<text>小微商户,需提供店铺门头照及实景照,店主身份证件及银行账户</text>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="center">
 						<view class="center">
-							<image v-if="typeIndex==0" style="width: 40rpx;height: 40rpx;" src="../../static/icon/check.png" mode=""></image>
+							<image v-if="typeIndex==1" style="width: 40rpx;height: 40rpx;" src="../../static/icon/check.png" mode=""></image>
 							<image v-else style="width: 40rpx;height: 40rpx;" src="../../static/icon/uncheck.png" mode=""></image>
 							<image v-else style="width: 40rpx;height: 40rpx;" src="../../static/icon/uncheck.png" mode=""></image>
 						</view>
 						</view>
 					</view>
 					</view>
 					
 					
-					<view @click="clickType(1)" class="item u-border-bottom" >
+					<view @click="clickType(0)" class="item u-border-bottom" style="margin-top: 40rpx;">
 						<view class="flex">
 						<view class="flex">
 							<view class="center">
 							<view class="center">
 								<image class="icon" src="../../static/icon/shop1.png" mode=""></image>
 								<image class="icon" src="../../static/icon/shop1.png" mode=""></image>
 							</view>
 							</view>
 							<view class="item-content">
 							<view class="item-content">
-								<text>小微商户</text>
-								<text>小微商户,需提供店铺门头照及实景照,店主身份证件及银行账户</text>
+								<text>企业商户/个体工商户</text>
+								<text>企业商户,需提供营业执照,企业法人证件,企业对公结算银行账户,特殊行业还需提供生产经营许可证(例如:食品、化妆品、药品等)</text>
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="center">
 						<view class="center">
-							<image v-if="typeIndex==1" style="width: 40rpx;height: 40rpx;" src="../../static/icon/check.png" mode=""></image>
+							<image v-if="typeIndex==0" style="width: 40rpx;height: 40rpx;" src="../../static/icon/check.png" mode=""></image>
 							<image v-else style="width: 40rpx;height: 40rpx;" src="../../static/icon/uncheck.png" mode=""></image>
 							<image v-else style="width: 40rpx;height: 40rpx;" src="../../static/icon/uncheck.png" mode=""></image>
 						</view>
 						</view>
 					</view>
 					</view>
@@ -329,7 +329,7 @@
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
-				typeIndex:0,
+				typeIndex:1,
 				
 				
 				//银行类型
 				//银行类型
 				bankCodeShow:false,
 				bankCodeShow:false,