1.修改项目文件目录结构

operatingCompany/common/request.js

@@ -13,10 +13,10 @@ const http = (url = '', date = {}, type = 'POST', header = {
 		//console.log(burl2 + url)
 		header={};
 		const logInData = uni.getStorageSync("logInData");
-		header['token']=logInData.token;
-		header['uid']=logInData.uid; 
-		// header['token']='BA205B2ABFE4445EA5D111042E7BCE56';
-		// header['uid']='BE98A41B9E0C44C1B5EDCBCE39D550D0'; 
+		// header['token']=logInData.token;
+		// header['uid']=logInData.uid; 
+		header['token']='BA205B2ABFE4445EA5D111042E7BCE56';
+		header['uid']='BE98A41B9E0C44C1B5EDCBCE39D550D0'; 
 		header['Content-Type']='application/x-www-form-urlencoded';
 		//console.log(header)
         uni.request({

operatingCompany/pages.json

@@ -1,13 +1,6 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/logIn/logIn",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false
-			}
-
-		},
+		
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -52,7 +45,7 @@
 
 		},
 		{
-			"path": "pages/changePassWord/changePassWord",
+			"path": "pages/accountSet/changePassWord",
 			"style": {
 				"navigationBarTitleText": "修改密码",
 				"navigationBarBackgroundColor": "#FFFFFF",
@@ -69,6 +62,14 @@
 				"enablePullDownRefresh": true
 			}
 
+		},
+		{
+			"path": "pages/logIn/logIn",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh": false
+			}
+		
 		}
 	],
 	"globalStyle": {

operatingCompany/pages/AccountSet/AccountSet.vue

@@ -23,7 +23,7 @@
 
 		<!-- 修改密码 -->
 		<view class="messageBg">
-			<view class="message" @click="goRouter('../changePassWord/changePassWord')">
+			<view class="message" @click="goRouter('changePassWord')">
 				<view class="leftTitle">修改密码</view>
 				<image class="rightArrow" src="../../static/img/icon_zhanghu_arrow.png" mode=""></image>
 			</view>

operatingCompany/pages/logIn/logIn.vue

@@ -24,8 +24,10 @@
 		<!-- 验证码 -->
 		<view class="codeBg">
 			<input type="text" class="code" placeholder="请输入验证码" v-model="codeValue" @confirm="codeDone" />
-			<view @click="send" v-if="phoneValue.length == 11" style="color: #FF4F00; font-size: 28rpx;">获取验证码</view>
-			<view style="color: #999999; font-size: 28rpx;" v-else>获取验证码</view>
+			<view @click="send" v-if="phoneValue.length == 11 && code_time == 0" style="color: #FF4F00; font-size: 28rpx;">获取验证码</view>
+			<view style="color: #999999; font-size: 28rpx;" v-if="phoneValue.length != 11 && code_time == 0">获取验证码</view>
+			<view style="color: #999999; font-size: 28rpx;" v-if="code_time > 0">重新获取({{code_time}}s)</view>
+			
 		</view>
 
 
@@ -45,7 +47,7 @@
 				roleType: 1, //1 运营陪伴 2 连锁门店
 				phoneValue: '',
 				codeValue: '',
-				
+				code_time: 0 ,// 倒计时
 
 			}
 		},
@@ -70,14 +72,33 @@
 				this.$http('accompany/superusers/sendSms', {
 					phone: this.phoneValue,
 
-				}, 'GET').then(res => {
+				}, 'GET').then(res => {
+					if(res.code!=0){
+							uni.showModal({
+								title: '提示',
+								content: res.msg,
+								success: function (res) {
+									
+								}
+							})
+						} else {
+							this.code_time = 60
+							let coder = setInterval(() => {
+								if (this.code_time > 0) {
+									this.code_time--
+								}
+								if (this.code_time == 0) {
+									clearInterval(coder)
+								}
+							}, 1000)
+						}
+					})
 
-				})
 			},
 			logIn() {
 
 				uni.showLoading({
-					title: '加载中'
+					title: '登录中'
 				})
 				this.$http('accompany/superusers/phoneLogin', {
 					phone: this.phoneValue,

operatingCompany/pages/team/manageStore.vue

@@ -18,7 +18,7 @@
 
 						<!-- 地址和电话 -->
 						<image class="tubiao" src="../../static/img/icon_daohang_def@2x.png" mode=""
-							@click="goAddress(item.lng, item.lat)">
+							@click="goAddress(item)">
 						</image>
 						<image class="tubiao" src="../../static/img/icon_phone_def@2x.png" mode=""
 							@click="call(item.ContactorPhone)">
@@ -94,8 +94,13 @@
 					uni.stopPullDownRefresh();
 				}, 1000);
 			},
-			goAddress(e) {
-				console.log('地图导航');
+			goAddress(v) {
+				uni.openLocation({
+					latitude: Number(v.lat),
+					longitude: Number(v.lng),
+					name: v.shopName,
+					address: v.Address,
+				});
 			},
 			call(e) {
 				if(e.length != 0) {

operatingCompany/pages/teamStore/teamStore.vue

@@ -38,7 +38,7 @@
 
 						<!-- 地址 和电话 图标 -->
 						<image class="tubiao" src="../../static/img/icon_daohang_def@2x.png"
-							@click="goAddress(item.lng, item.lat)">
+							@click="goAddress(item)">
 						</image>
 						<image class="tubiao" src="../../static/img/icon_phone_def@2x.png"
 							@click="call(item.ContactorPhone)">
@@ -142,8 +142,14 @@
 				this.page = 1
 				this.getShopData()
 			},
-			goAddress(e) {
-				console.log('地图导航');
+			goAddress(v) {
+				
+				uni.openLocation({
+					latitude: Number(v.lat),
+					longitude: Number(v.lng),
+					name: v.shopName,
+					address: v.Address,
+				});
 			},
 			call(e) {
 				if (e.length != 0) {
@@ -346,8 +352,10 @@
 	}
 
 	.lishi {
-		margin: 20rpx 50rpx;
-		color: #3C3C3C;
+		margin: 20rpx 50rpx;
+		margin-right: 20rpx;
+		color: #3C3C3C;
+		font-size: 28rpx;
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 28rpx;

operatingCompany/unpackage/dist/dev/mp-weixin/app.json

@@ -1,13 +1,13 @@
 {
   "pages": [
-    "pages/logIn/logIn",
     "pages/index/index",
     "pages/team/myTeam",
     "pages/team/manageStore",
     "pages/teamStore/teamStore",
     "pages/accountSet/accountSet",
-    "pages/changePassWord/changePassWord",
-    "pages/upcoming/upcoming"
+    "pages/accountSet/changePassWord",
+    "pages/upcoming/upcoming",
+    "pages/logIn/logIn"
   ],
   "subPackages": [],
   "window": {
@@ -21,6 +21,5 @@
       "desc": "获取门店地址"
     }
   },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "usingComponents": {}
 }

operatingCompany/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -8177,10 +8177,10 @@ var http = function http()
     //console.log(burl2 + url)
     header = {};
     var logInData = uni.getStorageSync("logInData");
-    header['token'] = logInData.token;
-    header['uid'] = logInData.uid;
-    // header['token']='BA205B2ABFE4445EA5D111042E7BCE56';
-    // header['uid']='BE98A41B9E0C44C1B5EDCBCE39D550D0'; 
+    // header['token']=logInData.token;
+    // header['uid']=logInData.uid; 
+    header['token'] = 'BA205B2ABFE4445EA5D111042E7BCE56';
+    header['uid'] = 'BE98A41B9E0C44C1B5EDCBCE39D550D0';
     header['Content-Type'] = 'application/x-www-form-urlencoded';
     //console.log(header)
     uni.request({

operatingCompany/unpackage/dist/dev/mp-weixin/pages/teamStore/teamStore.wxss

@@ -117,7 +117,9 @@
 }
 .lishi {
 	margin: 20rpx 50rpx;
+	margin-right: 20rpx;
 	color: #3C3C3C;
+	font-size: 28rpx;
 	width: 150rpx;
 	height: 56rpx;
 	border-radius: 28rpx;

operatingCompany/unpackage/dist/dev/mp-weixin/project.config.json

@@ -4,39 +4,7 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
+    "urlCheck": false
   },
   "compileType": "miniprogram",
   "libVersion": "",
@@ -44,15 +12,19 @@
   "projectname": "operatingCompany",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": []
     }
   }