调整卡号归属品牌信息展示

pageA/order/order.vue

@@ -30,8 +30,8 @@
               </view>
               <text class="word1"
                 >{{ showData.province }}&nbsp;{{ showData.city }}&nbsp;{{
-                  showData.is_private ? "民营运营商" : ""
-                }}（{{ showData.network }}）</text
+                  showData.is_private ? "虚拟运营商" : ""
+                }}（{{ showData.brand }}）{{ showData.network }}</text
               >
               <!-- 公告 -->
               <view class="notice_bg">

pages/flowDetails/flowDetails.vue

@@ -905,7 +905,7 @@
 				}
 				this.applyType = false
 				//#ifdef MP-TOUTIAO
-				this.form.pay_type = 4
+				this.form.pay_type = 6
 				this.form.platform_type = 'dy_mini'
 				//#endif
 				// 是否是H5支付
@@ -998,54 +998,87 @@
 							})
 
 						} else {
-							uni.requestPayment({
-								"provider": res.provider[0],
-								"orderInfo": val.res,
-								"service": 5,
-								getOrderStatus: res => new Promise((resolve, reject) => {
-									console.log(res)
-									resolve(res)
-								}),
-								success(res) {
-									console.log(res)
-									// 支付成功
-									if (res.code == 0) {
-										this_.$refs.uToast.show({
-											title: '支付成功',
-											type: 'success ',
-										})
-										uni.navigateTo({
-											url: '/pages/flowOrderDetails/flowOrderDetails?id=' +
-												res.data.data.id,
-										});
-									} else if (res.code == 4) {
-										this_.$refs.uToast.show({
-											title: '支付取消',
-											type: 'error ',
-										})
-									} else if (res.code == 1) {
-										this_.$refs.uToast.show({
-											title: '支付超时',
-											type: 'error ',
-										})
-									} else if (res.code == 2) {
-										this_.$refs.uToast.show({
-											title: '支付失败',
-											type: 'error ',
-										})
-									} else if (res.code == 3) {
-										this_.$refs.uToast.show({
-											title: '支付关闭 ',
-											type: 'error ',
-										})
-									} else {
+							// uni.requestPayment({
+							// 	"provider": res.provider[0],
+							// 	"orderInfo": val.res,
+							// 	"service": 5,
+							// 	getOrderStatus: res => new Promise((resolve, reject) => {
+							// 		console.log(res)
+							// 		resolve(res)
+							// 	}),
+							// 	success(res) {
+							// 		console.log(res)
+							// 		// 支付成功
+							// 		if (res.code == 0) {
+							// 			this_.$refs.uToast.show({
+							// 				title: '支付成功',
+							// 				type: 'success ',
+							// 			})
+							// 			uni.navigateTo({
+							// 				url: '/pages/flowOrderDetails/flowOrderDetails?id=' +
+							// 					res.data.data.id,
+							// 			});
+							// 		} else if (res.code == 4) {
+							// 			this_.$refs.uToast.show({
+							// 				title: '支付取消',
+							// 				type: 'error ',
+							// 			})
+							// 		} else if (res.code == 1) {
+							// 			this_.$refs.uToast.show({
+							// 				title: '支付超时',
+							// 				type: 'error ',
+							// 			})
+							// 		} else if (res.code == 2) {
+							// 			this_.$refs.uToast.show({
+							// 				title: '支付失败',
+							// 				type: 'error ',
+							// 			})
+							// 		} else if (res.code == 3) {
+							// 			this_.$refs.uToast.show({
+							// 				title: '支付关闭 ',
+							// 				type: 'error ',
+							// 			})
+							// 		} else {
 
-									}
-								},
-								fail(e) {
-									console.log(e)
-								}
-							})
+							// 		}
+							// 	},
+							// 	fail(e) {
+							// 		console.log(e)
+							// 	}
+							// })
+							
+							tt.requestOrder({
+							  data: val.data,
+							  byteAuthorization: val.byteAuthorization,
+							  success({ orderId }) {
+							    tt.getOrderPayment({
+							      orderId,
+							      success(res) {
+							        this_.$refs.uToast.show({
+							          title: "支付成功",
+							          type: "success ",
+							        });
+							        uni.navigateTo({
+							          url: "/pages/flowOrderDetails/flowOrderDetails?id=" + val.id,
+							        });
+							      },
+							      fail(err) {
+							        console.log(err, "err");
+							        if (err.errMsg == "pay:fail request payment cancel") {
+							          this_.$refs.uToast.show({
+							            title: "支付取消",
+							            type: "error ",
+							          });
+							        } else {
+							          this_.$refs.uToast.show({
+							            title: "支付失败",
+							            type: "error ",
+							          });
+							        }
+							      },
+							    });
+							  },
+							});
 						}
 					}
 				});

pages/footList/footList.vue

@@ -6,7 +6,7 @@
 		<view class="list">
 			<view class="li" v-for="(item,index) in boxList" :key="index" @tap="ListClick(item.mobile_id)">
 				<view class="number">{{item.no}}</view>
-				<view class="Operator">{{item.network}} {{item.city}}</view>
+				<view class="Operator">{{item.brand}} {{item.city}}</view>
 				<view class="money">¥{{item.amount}}</view>
 				<view class="btn" @tap.stop="deleteMet(item.mobile_user_history_id)">删除</view>
 			</view>

pages/index/index.vue

@@ -260,7 +260,7 @@
           <view class="empty"> ¥{{ item.amount_original }} </view>
         </view>
         <view class="source">
-          {{ item.network }}
+          {{ item.brand }}
           <text @click.stop="TotalCityHide(item.TotalCity)">{{
             item.TotalCity | areaName
           }}</text>

pages/payment/payment.vue

@@ -62,8 +62,8 @@
               <view class="text"
                 >{{ showData.info.mobile.province }}
                 {{ showData.info.mobile.city }}
-                {{ showData.info.mobile.is_private ? "民营运营商" : "" }} ({{
-                  showData.info.mobile.network
+                {{ showData.info.mobile.is_private ? "虚拟运营商" : "" }} ({{
+                  showData.info.mobile.brand
                 }})</view
               >
               <view class="priceNum">