Merge branch 'feature/task1.0.0-0505-ch' into msb_test

components/BsPay.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-08 00:39:50
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 14:12:29
+ * @LastEditTime: 2022-05-10 18:06:34
  * @Description: file content
 -->
 <template>
@@ -11,10 +11,10 @@
 		<div class="pay">
 			<span class="pay--timer">{{timer}}</span>
 			<UiMoney class="money" sufSize="14px" preSize="14px" size="20px" 
-				float suffix prefix :money="39"/>
+				float suffix prefix :money="money"/>
 			<div class="pay--code">
 				<img :src="imgUrl" v-if="imgUrl"/>
-				<p v-if="!timer">已超时，请重新下单</p>
+				<!-- <p v-if="!timer">已超时，请重新下单</p> -->
 			</div>
 			<p class="pay--tips">如支付后没有自动跳转，请点击 <span class="pay--finish" @click="finish">完成付款</span></p>
 		</div>

pages/account/index/order/detail/module/StatusInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 11:38:35
+ * @LastEditTime: 2022-05-10 18:05:07
  * @Description: file content
 -->
 <template>
@@ -20,7 +20,8 @@
 			</template>
 			</div>
 			<Cancel :visible.sync="cancelVisible" :orderId="orderInfo.orderId" @cancel="cancel"/>
-			<BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId" :timer="ctxCon.tips" @finish="payFinish"/>
+			<BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId" 
+				:timer="ctxCon.tips" @finish="payFinish" :money="orderInfo.payAmount"/>
 		</div>
 </template>
 <script>

pages/order/submit/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 17:41:16
+ * @LastEditTime: 2022-05-10 18:06:21
  * @Description: file content
 -->
 
@@ -23,7 +23,7 @@
 			<UiButton radius type="red_panel" @click="submit">立即支付</UiButton>
 		</div>
 		<BsPay :visible.sync="payVisible" :orderId="payOrder.orderId" :timer="payTimerTxt"
-			@cancel="cancelPay" @finish="finishPay"/>
+			@cancel="cancelPay" @finish="finishPay" :money="orderInfo.payAmount"/>
 	</div>
 </template>
 <script>
@@ -145,7 +145,7 @@ export default {
 			let minute = parseInt(this.payStartSecondNum / 60);
 			let second = parseInt(this.payStartSecondNum % 60);
 			this.payTimerTxt = `剩余${minute > 0 ? `${minute}分` : ''} ${second}秒`;
-			this.payTimerStop = setTimeout(()=>this.timer(),1000)
+			this.payTimerStop = setTimeout(()=>this.timer(),1000);
 		},
 		cancelPay(){
 			this.$router.replace(`/account/order/detail?id=${this.payOrder.orderId}`)