Web code updated

rc-busness/pages/myorder/usertion.vue

@@ -118,7 +118,7 @@
             </li>
             <li>
               <span>付款方式:</span>
-              <i>{{ information.paytype }}</i>
+              <i>{{ information.paytypeText }}</i>
             </li>
             <li>
               <span>配送方式:</span>
@@ -158,7 +158,18 @@
         {{ payorsucess }}
       </i>
     </div>
-
+	
+	<el-dialog :visible.sync="showPaytypeWarning" :close-on-click-modal="false">
+	  <div class="ts-warning-popup">
+	    <div class="title rc-full-width">
+	      <img src="../../assets/error.png" alt="" />
+	    </div>
+	    <div class="content rc-full-width rc-text--center rc-margin-y--md">
+	      <h3>温馨提示</h3>
+	      <span class="">{{ paytypeWarning.message}}</span>
+	    </div>
+	  </div>
+	</el-dialog>
     <MyFooter></MyFooter>
   </div>
 </template>
@@ -184,6 +195,8 @@ export default {
   data() {
     return {
 	  util,
+	  paytypeWarning:{result:true,message:''},
+	  showPaytypeWarning:false,
       goldmedal: [],
       userproductId: "",
       logisticsDate: "",
@@ -214,12 +227,9 @@ export default {
 		useraddress: [],
 		shopprice: {},
 		information: {
-		reference: "1111111111111111",
-		ordertime: "2012-12-01    11:20:00",
-		paytype: "微信支付",
-		distribution: "快递",
-		trackingnumber: "11111111111111",
-		catimage: require("../../assets/image/rc-left.png"),
+			paytypeText: "",
+			distribution: "快递",
+			catimage: require("../../assets/image/rc-left.png"),
       },
     };
   },
@@ -267,16 +277,20 @@ export default {
     },
     //订单支付和再次购买
 	onceagain(item) {
-		if (this.payorsucess == "立即支付") {
-			this.getwei(item);
-		} else {
-			this.$router.push({
-				path: "/productdetails/producted",
-				query: {
-					stype: 1,
-					productCode: this.userproductId,
-				},
-			});
+		this.paytypeWarning = this.util.checkPaytypeValidated(this.paytype);
+		this.showPaytypeWarning = !this.paytypeWarning.result;
+		if(this.paytypeWarning.result) {
+			if (this.payorsucess == "立即支付") {
+				this.getwei(item);
+			} else {
+				this.$router.push({
+					path: "/productdetails/producted",
+					query: {
+						stype: 1,
+						productCode: this.userproductId,
+					},
+				});
+			}
 		}
 	},
     async orderquantity(orderNumber) {
@@ -304,7 +318,8 @@ export default {
 			this.usersalesAmount = this.goldmedal[i].salesAmount;
 			this.addressUserName = this.goldmedal[i].addressUserName;
 			this.addressPhoneNumber = this.goldmedal[i].addressPhoneNumber;
-			this.paytype = (this.goldmedal[i].paytype=="1"?'微信支付':'支付宝');
+			this.paytype = this.goldmedal[i].paytype;
+			this.information.paytypeText = this.util.getTextByPaytype(this.paytype);
         }
       }
     },