修改登录

components/cm-module/cm-cart-temp/index.vue

@@ -386,6 +386,8 @@ export default {
 			this.$store.commit('updateAllNum', data.kindCount)
 			if (data.list.length === 0 && data.invalid.length === 0) {
 				this.isEmpty = true
+			}else{
+				this.isEmpty = false
 			}
 			this.infoCartData(data.list)
 			this.infoInvalidData(data.invalid)

pages/login/information.vue

@@ -360,19 +360,13 @@ export default {
 		handleDelete(type) {
 			switch (type) {
 				case 1:
-					this.$util.modal('', '确定删除营业执照图片吗？', '确定', '取消', true, () => {
-						this.params.businessLicense = ''
-					})
+					this.params.businessLicense = ''
 					break
 				case 2:
-					this.$util.modal('', '确定删除门头照图片吗？', '确定', '取消', true, () => {
-						this.params.shopPhoto = ''
-					})
+					this.params.shopPhoto = ''
 					break
 				case 3:
-					this.$util.modal('', '确定删除资质图片吗？', '确定', '取消', true, () => {
-						this.params.medicalPracticeLicense = ''
-					})
+					this.params.medicalPracticeLicense = ''
 					break
 			}
 		},

pages/login/login.vue

@@ -244,6 +244,7 @@ export default {
 				} else {
 				   this.$api.switchTabTo('/pages/tabBar/user/user')
 				}
+				uni.removeStorageSync('LOGIN_REDIRECT_URL')
 			} else {
 				this.$util.msg(data.msg, 2000)
 			}

pages/login/password.vue

@@ -86,7 +86,7 @@ export default {
 			codeParams:{
 				mobile:'',
 				isCheckCaptcha:1,
-				activateCodeType:1,
+				activateCodeType:10,
 				platformType:2,
 				imgCode:'',
 				token:'',

pages/tabBar/home/components/hotmode.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="hotmode-content clearfix">
 			<view class="hot-image le" @click="handleProcurement">
-				<image :src="staticUrl + 'icon_model_1@2x.png'" mode=""></image>
+				<image :src="staticUrl + 'icon_model_1@2x.jpg'" mode=""></image>
 			</view>
 			<view class="hot-image ri" @click.stop="handleJumpLink(mallTheme)">
 				<image :src="mallTheme.image" mode=""></image>

pages/user/order/components/details/goodsList.vue

@@ -53,7 +53,7 @@
 						<view class="text">{{ item.note ? item.note : '' }}</view>
 					</view>
 				</view>
-				<view class="goods-pros-b clearfix" v-if="information.onlinePayFlag == 0">
+				<view class="goods-pros-b clearfix">
 					<view class="pros-price-view" v-if="item.isHandelShow">
 						<view class="price-view-le">商品总额：</view>
 						<view class="price-view-ri">￥{{ item.totalAmount | NumFormat }}</view>

pages/user/pay/card-order.vue

@@ -86,7 +86,7 @@
 								</view>
 							</view>
 						</template>
-						<view class="pay-item" @click="tabClick(0)" v-if="showWeChatPayMode">
+						<!-- <view class="pay-item" @click="tabClick(0)" v-if="showWeChatPayMode">
 							<view class="pay-item-cell">
 								<view class="item-icon"><text class="iconfont icon-weixinzhifu"></text></view>
 								<view class="item-texts"><text>微信支付</text></view>
@@ -97,7 +97,7 @@
 									></text>
 								</view>
 							</view>
-						</view>
+						</view> -->
 						<!-- <view class="pay-item" @click="tabClick(1)" v-if="showB2BpayMode">
 							<view class="pay-item-cell">
 								<view class="item-icon"><text class="iconfont icon-qiyewangyinzhifu"></text></view>

pages/user/pay/mixins/cardMixins.js

@@ -5,12 +5,12 @@ const cardMixins = {
         return {
             popupShow: false, // 控制支付记录弹窗
             popupShow1: false, // 控制快捷支付银行弹窗
-            tabCurrentIndex: 0,
+            tabCurrentIndex: 3,
             weChatFlag: false, // 微信支付开关
             B2BpayFlag: false, //企业网银支付开关
             QuickPayFlag: false, // 快捷支付开发
-            buttonText: '微信支付',
-            btnColor: '#0ABC64',
+            buttonText: '使用银行卡快捷支付',
+            btnColor: '#F3B574',
             cardsList:[],//查看银行列表
             defaultCards: null,
         }
@@ -84,7 +84,7 @@ const cardMixins = {
             // }else{
             //     this.tabCurrentIndex = this.weChatFlag ? 0 : this.B2BpayFlag ? 1 : 2 
             // }
-            this.tabClick(0)
+            this.tabClick(3)
         }
     }
 }

pages/user/setting/phone.vue

@@ -127,7 +127,7 @@ export default {
 			let params =  {
 				mobile: this.params.newMobile,
 				isCheckCaptcha: 1,
-				activateCodeType: 5,
+				activateCodeType: 11,
 				platformType: 0
 			}
 			this.getMobileCode(params)

services/config.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
     // URL_CONFIG = 'http://192.168.2.103:18002' // 陈凯联调
-    URL_CONFIG = 'https://core-b.caimei365.com'
-    // URL_CONFIG = 'https://core.caimei365.com'  
+    // URL_CONFIG = 'https://core-b.caimei365.com'
+    URL_CONFIG = 'https://core.caimei365.com'  
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'

services/user.service.js

@@ -50,7 +50,7 @@ export default class UserService {
 	 */
     AorganizationLogin(data = {}) {
         return this.AjaxService.post({
-            url: '/user/login/password',
+            url: '/user/login/passwordOrganizeLogin',
             data,
             isLoading: true,
             isStatus: true,
@@ -66,7 +66,7 @@ export default class UserService {
 	 */
     userCodeLogin(data = {}) {
         return this.AjaxService.post({
-            url: '/user/login/codeLogin',
+            url: '/user/login/codeOrganizeLogin',
             data,
             isLoading: true,
             isStatus: true,