Merge branch 'master' of http://47.98.226.240:3000/twt/college

* 'master' of http://47.98.226.240:3000/twt/college:
  PC

common/request.js

@@ -0,0 +1,204 @@
+ const baseURL = 'https://api.dms.66km.com/'
+//const baseURL='http://wx.32che.cn/'
+//const baseURL='http://58.56.15.138:20189/'
+
+  // baseURL: 'http://192.168.0.140:20187',
+//authorizaURL: 'https://api.dms.66km.com/weixin/authorize',
+//const authorizaURL='http://wx.32che.cn/weixin/authorize'
+  //authorizaURL: 'http://58.56.15.138:20187/weixin/authorizeSimulation',
+  // authorizaURL: 'http://192.168.0.140:20187/weixin/authorizeSimulation',
+//const code='B527DBDDC89D4A29902D1C7CE34814FB'
+
+//const webURL='http://192.168.0.215:9588/#/'
+//const webURL='http://dms.32che.cn/#/'
+const webURL='https://minh5.66km.com/#/'
+
+
+
+import md5 from './MD5.js'
+
+
+const fetchPost = (url = '', params = {}, header = {
+}) => {
+    return new Promise((resolve, reject) => {
+		header['Content-Type']='application/x-www-form-urlencoded';
+		header['code'] = code
+		params = {
+		  ...params,
+		  _t: new Date().getTime()
+		}
+        uni.request({
+            method: 'POST',
+            url: baseURL + url,
+            data: params,
+            header: header,
+            dataType: 'json',         
+        }).then((response) => {
+           setTimeout(function() {
+                uni.hideLoading();
+            }, 200); 
+			  let [error, res] = response;
+			if(res.data.code==403){
+				uni.showToast({
+				     title: res.data.msg,
+				 	 icon:'none',
+				     duration: 3000,
+				 });
+				 uni.clearStorageSync()
+				 uni.navigateTo({
+					url:'../login/login'
+				}) 
+			}else if(res.data.code==409){
+				 // getToken(url,date,type,header)
+			}
+          		
+            resolve(res.data);
+        }).catch(error => {
+            let [err, res] = error;
+            reject(err)
+        }) 
+    });
+}
+const fetchGet = (url = '', params = {}, header = {
+}) => {
+    return new Promise((resolve, reject) => {
+		header['Content-Type']='application/x-www-form-urlencoded';
+		header['code'] = code
+		params = {
+		  ...params,
+		  _t: new Date().getTime()
+		}
+        uni.request({
+            method: 'GET',
+            url: baseURL + url,
+            data: params,
+            header: header,
+            dataType: 'json',         
+        }).then((response) => {
+           setTimeout(function() {
+                uni.hideLoading();
+            }, 200); 
+			let [error, res] = response;
+            resolve(res.data);
+        }).catch(error => {
+            let [err, res] = error;
+            reject(err)
+        }) 
+    });
+}
+ 
+
+const http = (url = '', date = {}, type = 'POST', header = {
+}) => {
+    return new Promise((resolve, reject) => {
+		header={};
+		const wxOpendata = uni.getStorageSync("wxOpendata");
+		if(wxOpendata){
+			header['code']=wxOpendata.code;
+			
+		}else{
+			header['code']='';
+			
+		}
+		
+		//header['token']='98A9FED8814B457288166BDF623F33D1';
+		//header['uid']='795957B6-8F4B-4E7F-96FE-1F26E5BA21A1'; 
+		header['Content-Type']='application/x-www-form-urlencoded';
+		console.log(baseURL + url)
+        uni.request({
+            method: type,
+            url: baseURL + url,
+            data: date,
+            header: header,
+            dataType: 'json',         
+        }).then((response) => {
+           /* setTimeout(function() {
+                uni.hideLoading();
+            }, 200); */
+            let [error, res] = response;
+		 
+			if(res.data.code==401||res.data.code==403){
+				 uni.showToast({
+				     title: res.data.msg,
+				 	 icon:'none',
+				     duration: 3000,
+				 });
+				 uni.clearStorageSync()
+				 /* uni.navigateTo({
+					url:'../login/login'
+				}) */
+			}else if(res.data.code==409){
+				 // getToken(url,date,type,header)
+			}
+            resolve(res.data);
+        }).catch(error => {
+            let [err, res] = error;
+            reject(err)
+        }) 
+    });
+}
+
+
+function getToken(url,date,type,header){
+	var header={};
+    //var userId=uni.getStorageSync("devData").userId;
+	//var devData=uni.getStorageSync("devData")
+	header['Content-Type']='application/x-www-form-urlencoded';
+	uni.request({
+	    method: "POST",
+	    url: baseURL + '/sys/getTokenByUserID',
+	    data: {
+			userId:userId
+		},
+	    header: header,
+	    dataType: 'json',         
+	}).then((response) => {
+	    let [error, res] = response;
+		var accessToken=res.data.data.accessToken.accessToken;
+		devData.accessToken=accessToken;
+		uni.setStorage({
+			   key: 'devData',
+			   data:devData,
+			   success: function () {
+				   refresh(url,date,type,header) //刷新接口
+			   }
+		 });
+		  // console.log(accessToken)
+	}).catch(error => {
+	   
+	}) 
+}
+
+function refresh(url,date,type,header){
+	uni.request({
+	    method: type,
+	    url: baseURL + url,
+	    data: date,
+	    header: header,
+	    dataType: 'json',         
+	}).then((response) => {
+	   setTimeout(function() {
+	        uni.hideLoading();
+	    }, 200); 
+	    let [error, res] = response;
+	  
+		if(res.data.code==403){
+			uni.showToast({
+			     title: res.data.msg,
+			 	 icon:'none',
+			     duration: 3000,
+			 });
+			 uni.navigateTo({
+				url:'../login/login'
+			}) 
+		}
+	    resolve(res.data);
+	}).catch(error => {
+	    let [err, res] = error;
+	    reject(err)
+	})
+}
+
+export default {
+	http,baseURL,fetchGet,fetchPost,webURL
+}

pages/pc/index.vue

@@ -1,6 +1,13 @@
 <template>
 	<view class="content">
-		<view class="test"></view>
+		<view class="nav">
+			<view class="navCont">
+				<view class="logo">
+					<image src="../../static/pcimg/nav_logo@2x.png" mode="" class="logoImg"></image>
+				</view>
+				<view class="navTitle">门店学院</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -21,9 +28,21 @@
 </script>
 
 <style scoped>
-	.test{
-		width: 350rpx;
-		height: 350rpx;
-		background: red;
+	.nav{
+		width: 100%;
+		height: 72px;
+		background: #FFFFFF;
+		box-shadow: 0px 4px 10px 0px rgba(153, 153, 153, 0.12);
+		display: flex;
+		justify-content: center;
+	}
+	.navCont{
+		width: 1200px;
+		display: flex;
+	}
+	.logoImg{
+		width: 86px;
+		height: 36px;
+		margin-top: 19px;
 	}
 </style>