订单

common/config/wxLogin.js

@@ -40,13 +40,7 @@ const wxLoginQuick = async function(){// 根据微信的code获取用户登录
             store.commit('login',response.data)
             uni.setStorageSync('token',response.data.token)
             uni.setStorageSync('unionId',response.data.unionId)
-            if(response.data.userIdentity ==1){
-                uni.navigateTo({url:'/pages/seller/index/index'})
-            }else if(response.data.userIdentity === 3){
-                uni.navigateTo({url:'/pages/supplier/index/index'})
-            }else{
-                uni.switchTab({url:'/pages/tabBar/user/user'})
-            }
+            uni.switchTab({url:'/pages/tabBar/user/user'})
         })
         .catch(error =>{
             uni.setStorageSync('unionId',error.data.unionId)

pages/login/login.vue

@@ -257,7 +257,7 @@ export default {
 		},
 		async checkedAuthorize() {
 			//是否已授权 0:为取消授权 1:为已授权 2:为未操作
-			// wxLogin.wxLoginQuick()
+			wxLogin.wxLoginQuick()
 		}
 	},
 	onShow() {

pages/tabBar/home/index.js

@@ -76,7 +76,7 @@ const homeMiXins = {
                 this.logout()
                 uni.setStorageSync('unionId', error.data.unionId)
                 this.$store.commit('updateStatus', error.data)
-				 this.mallOrganizeHome()
+                this.mallOrganizeHome()
             }
         },
         async updateCartCount() {

pages/user/order/components/choiceAddress.vue

@@ -26,7 +26,7 @@
 		 		</view>
 		 	</view>
 		 </navigator>
-		 <image  src="../../../static/temp/line@3x.png" mode=""></image>
+		 <image  :src="staticUrl + 'line@3x.png'" mode=""></image>
 	</view>
 </template>
 
@@ -40,6 +40,7 @@
 		},
 		data() {
 			return{
+				staticUrl: this.global.staticUrl,
 				isEmpty:false,
 				addressSrc:'',
 			}

pages/user/order/order-sharelogin.vue

@@ -23,16 +23,8 @@
 			<view class="container-footer" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 				<view class="login-btn" v-if="btnState.isPay" @click.stop="btnConfirmPay">立即支付</view>
 				<view class="login-sub">
-					<view class="btn" @click.stop="goLogin(1)">账号登录查看</view>
 					<view class="btn" @click.stop="goLogin(2)">使用分享码查看</view>
 				</view>
-				<view class="pay-statustext">
-					<view class="pay-statustext-inner">
-						<view class="pay-text">
-							<text>使用账号登录支持确认订单和直接付款，使用分享码只支持查看订单，不能操作</text>
-						</view>
-					</view>
-				</view>
 			</view>
 		</template>
 		<!-- 提示弹窗 -->
@@ -306,7 +298,7 @@ export default {
 		display: flex;
 		.btn {
 			flex: 1;
-			width: 288rpx;
+			width: 600rpx;
 			height: 88rpx;
 			box-sizing: border-box;
 			border: 1px solid #b2b2b2;
@@ -330,23 +322,5 @@ export default {
 		bottom: 0;
 		left: 0;
 	}
-	.pay-statustext {
-		width: 100%;
-		height: auto;
-		float: left;
-		.pay-statustext-inner {
-			width: 600rpx;
-			margin: 0 auto;
-			.pay-text {
-				width: 600rpx;
-				height: 100%;
-				float: left;
-				line-height: 40rpx;
-				font-size: $font-size-26;
-				color: #fea785;
-				text-align: justify;
-			}
-		}
-	}
 }
 </style>

pages/user/pay/card-under.vue

@@ -19,11 +19,11 @@
 			</view>
 			<view class="pay-bring-wrapper clearfix">
 				<view class="pay-bring-content">
-					<view class="text-title">
-						<image src="https://static.caimei365.com/app/img/icon/icon-vxkecode.png" mode="" @click="previewImg"></image>
-					</view>
-					<view class="text-v">订单标识：{{payOrderId}} <text class="clipboard" @click.stop="clipboard(payOrderId)">复制</text></view>
-					<view class="text-content">请点击上方二维码，长按保存后，使用微信扫码添加采美客服，将订单标识告知客服，客服会为您推荐最合适的线下转账方式。</view>
+					<view class="text-v title">转账信息 <text class="clipboard" @click.stop="clipboard(clipboardtEXT)">复制信息</text></view>
+					<view class="text-v">开户行：{{ bankInfo.bankOfDeposit }}</view>
+					<view class="text-v">银行卡号：{{ bankInfo.bankCardNo }}</view>
+					<view class="text-v">户名：{{ bankInfo.bankUserName }}</view>
+					<view class="text-content">请将订单款项转账至上述账号，转账完成后截图支付凭证，并在订单页面上传支付凭证。</view>
 				</view>
 			</view>
 		</view>		
@@ -32,11 +32,17 @@
 
 <script>
 	const thorui = require('@/components/clipboard/clipboard.thorui.js')
-	import bankMixins from '@/mixins/bankMixins.js'
+	import bankMixins from './mixins/bankMixins.js'
 	export default{
 		mixins: [bankMixins],
 		data(){
 			return{
+				bankInfo:{
+					bankOfDeposit:'中国农业银行股份有限公司北京康运支行',
+					bankCardNo:'11230401040009344',
+					bankUserName:'李斌'
+				},
+				clipboardtEXT:`开户行：中国农业银行股份有限公司北京康运支行，银行卡号：11230401040009344，户名：李斌`,
 				orderId:'',
 				payableAmount:0,
 				payOrderId:'',
@@ -77,7 +83,7 @@
 				console.log(e)
 				this.orderId = e.orderId
 				this.payOrderId ='#'+e.orderId+'#'
-				this.cmGetBankTypeLists()	
+				// this.cmGetBankTypeLists()	
 				this.PayOrderCheckoutCounter(this.orderId)
 			},
 			async PayOrderCheckoutCounter(orderId){
@@ -350,7 +356,6 @@
 				width: 654rpx;
 				height: auto;
 				padding: 0 24rpx;
-				
 				.text{
 					font-size: $font-size-24;
 					color: #666;
@@ -420,39 +425,41 @@
 					}
 				}
 				.text-v{
-					font-size: $font-size-32;
+					font-size: $font-size-28;
 					color: #4A4F58;
 					line-height: 70rpx;
-					text-align: center;
+					text-align: justify;
 					margin-bottom: 30rpx;
 					&.bg-color{
 						line-height: 44rpx;
 						color: $color-system;
 					}
 					.clipboard{
-						width: 128rpx;
 						height: 48rpx;
-						background:linear-gradient(34deg, #FF2929 0%, #FF6D1B 100%);
+						background: #E2E2E2;
 						text-align: center;
 						font-size: $font-size-24;
-						color: #FFFFFF;
+						color: #999999;
 						border-radius: 24rpx;
-						line-height: 48rpx;
+						line-height: 46rpx;
 						display: inline-block;
-						margin-left: 10rpx;
+						margin-left: 24rpx;
+						border: 1px solid #f7f7f7;
+						box-sizing: border-box;
+						padding: 0 10px;
 					}
 				}
 				.text-content{
 					width: 100%;
-					height: 160rpx;
 					background-color: #F5F5F5;
 					box-sizing: border-box;
 					padding: 24rpx;
-					line-height: 40rpx;
+					line-height: 44rpx;
 					font-size: $font-size-28;
-					color: #666666;
+					color: $color-system;
 					text-align: justify;
 					margin-top: 60rpx;
+					border-radius: 8rpx;
 				}
 			}
 		}