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

luntai/index.html

@@ -362,7 +362,7 @@
 					// 		 code: '10000351'
 					//  });
 					//  return;
-					
+
 					this.ifHasPrme('camera', function (ret) {
 						if (ret == true) {
 							_this.scan(_this.scanCode, function (ret) {
@@ -506,4 +506,4 @@
 			}
 		})
 	}
-</script>
+</script>

luntai/login.html

@@ -266,4 +266,4 @@
 	}
 </script>
 
-</html>
+</html>

luntai/meber.html

@@ -234,12 +234,12 @@
 						</div>
 					</div> -->
 
-					<!-- <div class="item flex a-center jlr" v-on:click="openWin('monthAccounts')">
+					<div class="item flex a-center jlr" v-on:click="openWin('monthAccounts')">
 						<h4>月度结算</h4>
 						<div class="flex a-center rightIcons">
 							<i class="iconfont icon-right"></i>
 						</div>
-					</div> -->
+					</div>
 					<div class="item flex a-center jlr" v-on:click="openWin('backMoney')">
 						<h4>核销管理</h4>
 						<div class="flex a-center rightIcons">

luntai/monthAccountsDetails_body.html

@@ -330,14 +330,6 @@ apiready = function() {
 								});
 							}
 							_this.agentInfo = ret.data;
-							if (_this.agentInfo.saveAppMessage != 1) {
-								_this.inMobileMessage();
-							}
-							$api.setStorage("storeName", ret.data.storeName);
-							if (mescroll) {
-								mescroll.endSuccess()
-							}
-
 						}
 					});
 				},

script/httpRequest.js

@@ -271,7 +271,7 @@ var $http = function () {
 	this.getConfirmMonth = "/web/biz/bizMonthDetail/getConfirmMonth";//获取已确认的月份
 	this.getMonthDetail = "/web/biz/bizMonthDetail/getMonthDetail";//获取月结明细
 	this.confirmMonthDetail = "/web/biz/bizMonthDetail/confirmMonthDetail";//确认月结明细
-
+	this.getRegistTime = "/web/biz/bizMonthDetail/getRegistTime";//获取门店注册时间
     //通过图片获取信息
 	this.licenseDiscern="/web/bizLogin/licenseDiscern";
 	//运营执行信息是否有效