优化代码

luntai/index.html

@@ -500,7 +500,6 @@
 				this.ifHasPrme('storage', function (ret) {
 					if (ret == true) {
 						_this.getNewVersionUrl(function () {
-
 						});
 					}
 				})

luntai/saomachuku.html

@@ -250,27 +250,34 @@
 						url = "getStoreByScan",
 						_this = this;
 					this.$post(url, data, function (ret) {
-						if (api.systemType != 'ios') {
-							api.require('audioStreamer').openPlayer({
-								path: 'widget://res/scansuccess.mp3',
-							}, function (ret) {
-								if (ret.status) {
-									//api.alert({ msg: JSON.stringify(ret) });
-								}
-							});
-						}
+						if (!ret.message) {
+							if (api.systemType != 'ios') {
+								api.require('audioStreamer').openPlayer({
+									path: 'widget://res/scansuccess.mp3',
+								}, function (ret) {
+									if (ret.status) {
+										//api.alert({ msg: JSON.stringify(ret) });
+									}
+								});
+							}
 
-						if (ret.code == 0 || ret.code == '0') {
-							// if(ret.Data[0].isRegular == 1 || ret.Data[0].isRegular == '1'){
-							//    api.toast({msg : "该物料是非正规渠道"});
-							// 	 return;
-							// }
-							if (ret.Data[0].maktx != null) {
-								ret.Data[0].tireNumber = _this.code
-								ret.Data[0].scanWay = 0
-								_this.inputStore.push(ret.Data[0]);
-								_this.codes.push(_this.code);
+							if (ret.code == 0 || ret.code == '0') {
+								// if(ret.Data[0].isRegular == 1 || ret.Data[0].isRegular == '1'){
+								//    api.toast({msg : "该物料是非正规渠道"});
+								// 	 return;
+								// }
+								if (ret.Data[0].maktx != null) {
+									ret.Data[0].tireNumber = _this.code
+									ret.Data[0].scanWay = 0
+									_this.inputStore.push(ret.Data[0]);
+									_this.codes.push(_this.code);
+								}
 							}
+						} else {
+							api.toast({
+								msg: ret.message,
+							});
+							return
 						}
 					})
 				},

luntai/saomaruku.html

@@ -250,30 +250,35 @@
 						url = "getStoreByScan",
 						_this = this;
 					this.$post(url, data, function (ret) {
-						if (api.systemType != 'ios') {
-							api.require('audioStreamer').openPlayer({
-								path: 'widget://res/scansuccess.mp3',
-							}, function (ret) {
-								if (ret.status) {
-									//api.alert({ msg: JSON.stringify(ret) });
+						if (!ret.message) {
+							if (api.systemType != 'ios') {
+								api.require('audioStreamer').openPlayer({
+									path: 'widget://res/scansuccess.mp3',
+								}, function (ret) {
+									if (ret.status) {
+										//api.alert({ msg: JSON.stringify(ret) });
+									}
+								});
+							}
+							if (ret.code == 0 || ret.code == '0') {
+								// if (ret.Data[0].isRegular == 1 || ret.Data[0].isRegular == '1') {
+								// 	api.toast({
+								// 		msg: "该物料是非正规渠道"
+								// 	});
+								// 	return;
+								// }
+								if (ret.Data[0].maktx != null) {
+									ret.Data[0].tireNumber = _this.code
+									ret.Data[0].scanWay = 0
+									_this.inputStore.push(ret.Data[0]);
+									_this.codes.push(_this.code);
 								}
-							});
-						}
-
-
-						if (ret.code == 0 || ret.code == '0') {
-							// if (ret.Data[0].isRegular == 1 || ret.Data[0].isRegular == '1') {
-							// 	api.toast({
-							// 		msg: "该物料是非正规渠道"
-							// 	});
-							// 	return;
-							// }
-							if (ret.Data[0].maktx != null) {
-								ret.Data[0].tireNumber = _this.code
-								ret.Data[0].scanWay = 0
-								_this.inputStore.push(ret.Data[0]);
-								_this.codes.push(_this.code);
 							}
+						} else {
+							api.toast({
+								msg: ret.message,
+							});
+							return
 						}
 					})
 				},

luntai/sign_address.html

@@ -37,16 +37,15 @@
             </div>
         </header>
         <div class="card-list">
-            <van-cell is-link v-on:click="getSignLv" v-if="contractTask==0">{{valueLv}}</van-cell>
+            <van-cell is-link v-on:click="getSignLv" v-if="contractTask==0">
+                <div :style="{ color:titleStyle}">{{valueLv}}</div>
+            </van-cell>
             <van-cell is-link v-on:click="goMap" v-if="addressModify==0">{{address}}</van-cell>
             <van-popup v-model="showPicker" position="bottom" :style="{ height: '30%' }">
                 <van-picker title="签约等级" show-toolbar v-bind:columns="signList" value-key="signLv"
                     v-on:cancel="onCancel" v-on:confirm="onConfirm" />
             </van-popup>
-            <div style="background-color: #fff;margin: .2rem;padding: .2rem;border-radius: .2rem;">
-                说明：<br>
-                 1,更改后的签约任务自2020年10月1日起生效，即自10月1日起考核签约任务完成量，2020年10月1日后不允许再次更改签约任务。<br>
-                 2,修改签约地址后电子围栏即刻生效，2020年10月1日之前您可多次调整门店地址直至合适。2020年10月1日之后不能再更改。<br>
+            <div style="background-color: #fff;margin: .2rem;padding: .2rem;border-radius: .2rem;" v-html="text">
             </div>
         </div>
     </div>
@@ -79,7 +78,10 @@
                 userDistrct: '',
                 address: '请选择地址',
                 addressModify: addressModify,
-                contractTask: contractTask
+                contractTask: contractTask,
+                SingLvStatus: false,
+                titleStyle: "#000",
+                text:""
             },
             methods: {
                 init: function () {
@@ -103,11 +105,18 @@
                             name: 'map_win'
                         });
                     })
+                    this.getStoreSignMessage()
                 },
                 onCancel: function () {
                     this.showPicker = false;
                 },
                 getSignLv: function () {
+                    if (this.SingLvStatus) {
+                        api.toast({
+                            msg: "本次签约任务已修改，请勿重复修改"
+                        });
+                        return
+                    }
                     this.showPicker = true;
                     var url = "getSignLvU",
                         _this = this;
@@ -126,7 +135,7 @@
                     this.numTask = value.numTask;
                     this.showPicker = false;
                 },
-                SignlvList:function(){
+                SignlvList: function () {
                     var _this = this,
                         url = "SignlvList",
                         data = {
@@ -140,10 +149,11 @@
                             if (ret.list.length != 0) {
                                 _this.valueLv = ret.list[0].signLv;
                                 _this.numTask = ret.list[0].numTask;
-                                if(!_this.valueLv){
-                                    _this.valueLv="请选择签约等级"
-                                }
+                                _this.titleStyle = "#969799"
+                                _this.SingLvStatus = true
                                 _this.oldvalueLv = ret.list[0].signLv;
+                            } else {
+                                _this.valueLv = "请选择签约等级"
                             }
                         }
                     });
@@ -162,43 +172,35 @@
                             if (ret.list.length != 0) {
                                 _this.address = ret.list[0].province + ret.list[0].city + ret.list[0].district + ret.list[0].addressInfo;
                                 if (!_this.address) {
-                                    _this.address="请选择地址"
+                                    _this.address = "请选择地址"
                                 }
                                 _this.oldaddress = ret.list[0].province + ret.list[0].city + ret.list[0].district + ret.list[0].addressInfo;
                                 var reg = new RegExp("null", "g");
-                                _this.address = _this.address.replace(reg, "")                
+                                _this.address = _this.address.replace(reg, "")
                             }
                         }
                     });
                 },
-                updatesign:function(){
-                    if(this.valueLv!=this.oldvalueLv&&this.valueLv!="请选择签约等级"){
-                        this.SignlvUpdate();
-                    }
-                    if(this.address!=this.oldaddress&&this.address!="请选择地址"){
-                        this.AddressUpdate();
-                    }
-                    if(this.valueLv==this.oldvalueLv&&this.address==this.oldaddress){
+                updatesign: function () {
+                    if (this.valueLv == "请选择签约等级") {
                         api.toast({
-                                msg: "请勿重复修改"
-                         });
-                    } 
-                    if(this.valueLv=="请选择签约等级"&&this.address==this.oldaddress){
-                        api.toast({
-                            msg: "请勿重复修改"
+                            msg: "请按所需修订您的签约等级，再提交"
                         });
+                        return
                     }
-                    if(this.valueLv==this.oldvalueLv&&this.address=="请选择地址"){
+                    if (this.address == "请选择地址") {
                         api.toast({
-                            msg: "请勿重复修改"
+                            msg: "请按所需修订您的地址后，再提交"
                         });
+                        return
                     }
-                    if(this.valueLv=="请选择签约等级"&&this.address=="请选择地址"){
-                        api.toast({
-                                msg: "请按所需修订您的签约等级或地址后，再提交"
-                        });
+                    if (this.valueLv != this.oldvalueLv && this.valueLv != "请选择签约等级") {
+                        this.SignlvUpdate();
                     }
-                 
+                    if (this.address != this.oldaddress && this.address != "请选择地址") {
+                        this.AddressUpdate();
+                    }
+
                 },
                 SignlvUpdate: function () {
                     var _this = this,
@@ -254,6 +256,16 @@
                         }
                     });
                 },
+                getStoreSignMessage: function () {
+                    var _this = this,
+                        url = "getStoreSignMessage",
+                        data = ""
+                    this.$get(url, data, function (ret) {
+                        if (ret.code == 0) {
+                            _this.text=ret.message.replace(/\\n/g, "<br>")
+                        }
+                    });
+                },
                 goMap: function () {
                     this.goWin('map_win', 'map_win.html');
                 },

script/httpRequest.js

@@ -280,6 +280,8 @@ var $http = function () {
 	this.storeUpdatalicense="/web/biz/bizStoreBasicInfo/storeUpdateLicense"
 	//解冻
 	this.storeUnfreezeProposer="/web/biz/bizAgentFunction/storeUnfreezeProposer"
+	// 获取修改提示
+	this.getStoreSignMessage= "/web/biz/getStoreSignMessage"
 }
 $http.prototype.$postFile = function (url, data, callback) {
 	var urlT = this.ip + eval('this.' + url);