Merge branch 'test' of git.echepei.com:sailun/sailun-shop into test

luntai/couponList_body.html

@@ -58,7 +58,7 @@
 									<span>失效时间：{{ item.expireTime }}</span>
 								</div>
 								<div class="bottom flex a-center jlr" @click="item.state = !item.state">
-									<span>适用型号：{{ item.tireSize }}</span>
+									<span>适用型号：{{ item.couponDescribe}}</span>
 								</div>
 							</div>
 						</li>
@@ -108,6 +108,9 @@
 				userid: '',
 				chooseStatusIndex: 0,
 				couponStatus: [{
+					name: '未激活',
+					code: 0,
+				}, {
 					name: '未使用',
 					code: 1,
 				}, {
@@ -115,7 +118,7 @@
 					code: 2
 				}, {
 					name: '已失效',
-					code: 3
+					code: 4
 				}],
 				frist : 1,
 				current : 1,

luntai/rukutongji_body.html

@@ -288,7 +288,7 @@
 								return e.tirenumber == _this.selectedData.tirenumber
 							})
 							.forEach(function (e) {
-								e.couponName = "-¥" + a.bonus;
+								e.couponName = "¥" + a.bonus;
 								e.couponId = a.id;
 							})
 					} else if (a.checked == true && this.selectedData.couponId == a.id) {

luntai/sign_address.html

@@ -182,18 +182,18 @@
                     });
                 },
                 updatesign: function () {
-                    if (this.valueLv == "请选择签约等级") {
-                        api.toast({
-                            msg: "请按所需修订您的签约等级，再提交"
-                        });
-                        return
-                    }
-                    if (this.address == "请选择地址") {
-                        api.toast({
-                            msg: "请按所需修订您的地址后，再提交"
-                        });
-                        return
-                    }
+                    // if (this.valueLv == "请选择签约等级"&&contractTask==0) {
+                    //     api.toast({
+                    //         msg: "请按所需修订您的签约等级，再提交"
+                    //     });
+                    //     return
+                    // }
+                    // if (this.address == "请选择地址"&&addressModify==0) {
+                    //     api.toast({
+                    //         msg: "请按所需修订您的地址后，再提交"
+                    //     });
+                    //     return
+                    // }
                     if (this.valueLv != this.oldvalueLv && this.valueLv != "请选择签约等级") {
                         this.SignlvUpdate();
                     }