Merge branch 'dev' of maopiao/mp-ui-user into test

src/config/dev.js

@@ -8,5 +8,5 @@ export default {
   // #ifdef H5
   apiBase: process.env.VUE_APP_BASE_API,
   // #endif
-  filePublic: "https://mp-public-test-1307117429.cos.ap-shanghai.myqcloud.com/"
+  filePublic: "https://mp-public-test-1309783959.cos.ap-shanghai.myqcloud.com/"
 }

src/packagePrize/bean/components/transfer.vue

@@ -17,7 +17,7 @@
 					<u-input placeholder="请输入转赠数量" type="number" border="surround" v-model="beanNum" />
 				</view>
 				<view class="loss">
-					<view>盲豆转增折损说明：</view>
+					<view>盲豆转赠折损说明：</view>
 					<view>（20个盲豆起转，每次扣除10盲豆）</view>
 				</view>
 				<view class="flex set-turn-btn">
@@ -85,11 +85,11 @@
 					return
 				}
 				if(this.beanNum < 20) {
-					uni.$u.toast('每次转增盲豆不少于20')
+					uni.$u.toast('每次转赠盲豆不少于20')
 					return
 				}
 				if(this.beanNum > 1000) {
-					uni.$u.toast('每次最多转增1000')
+					uni.$u.toast('每次最多转赠1000')
 					return
 				}
 				if(this.beanNum > this.coinNum) {
@@ -104,7 +104,7 @@
 						this.close()
 						this.$emit('confirm')
 						setTimeout(()=>{
-							uni.$u.toast('转让成功')
+							uni.$u.toast('转赠成功')
 						},500)
 					}
 				})

src/packagePrize/bean/index.vue

@@ -42,7 +42,7 @@
 					<view class="flex right">
 						<view class="amt">{{ item.logMoney > 0 ? '+' : '' }}{{ item.logMoney }}</view>
 						<view class="balance">余额：{{ item.money }}</view>
-						<view class="beanNum" v-if="item.logText.split(',')[1]">-</view>
+						<view class="beanNum" v-if="item.logText.split('｜')[1]">-</view>
 					</view>
 				</view>
 			</view>
@@ -119,7 +119,7 @@
 				this.getList()
 			},
 			
-			//盲票转增
+			//盲票转赠
 			onTransfer() {
 				this.popupShow = true
 			},
@@ -129,6 +129,8 @@
 			},
 			
 			confirm() {
+				//刷新盲豆数量
+				this.getBean()
 				//刷新盲豆记录
 				this.pageList()
 			},

src/packagePrize/choice/index.vue

@@ -491,7 +491,7 @@
 		position: relative;
 		width: 100%;
 		height: 100vh;
-		background: url(https://mp-public-test-1307117429.cos.ap-shanghai.myqcloud.com/EQCE9TSY4VTY2C4RCTPW.jpg) center center no-repeat;
+		background: url(https://mp-public-test-1309783959.cos.ap-shanghai.myqcloud.com/EQCE9TSY4VTY2C4RCTPW.jpg) center center no-repeat;
 		background-size: 100vw 100vh;
 		overflow: hidden;
 	}

src/packagePrize/purchase/index.vue

@@ -20,7 +20,7 @@
 		</view>
 		<!-- #endif -->
 		<view class="purchase">
-			<image class="imgOne" src="https://mp-public-test-1307117429.cos.ap-shanghai.myqcloud.com/v2/buy_suc.png"
+			<image class="imgOne" src="https://mp-public-test-1309783959.cos.ap-shanghai.myqcloud.com/v2/buy_suc.png"
 				mode="scaleToFill"></image>
 			<image class="imgTwo" :src="picUrl" mode="scaleToFill"></image>
 		</view>

src/pages/index/index.vue

@@ -617,7 +617,7 @@
 		position: relative;
 		width: 100%;
 		height: calc(100vh - 50px);
-		background: url(https://mp-public-test-1307117429.cos.ap-shanghai.myqcloud.com/v2/bkg1.png) center center no-repeat;
+		background: url(https://mp-public-test-1309783959.cos.ap-shanghai.myqcloud.com/v2/bkg1.png) center center no-repeat;
 		background-size: 100vw calc(100vh - 50px);
 
 		.index {

src/pages/index/payExternal.vue

@@ -87,7 +87,6 @@
 					orderId: this.orderId,
 				}).then(res => {
 					uni.hideLoading();
-					console.log(res);
 					if (res.code == 0) {
 						if(res.data.status != 3) {
 							uni.showToast({