zhengkaixin 3 years ago
parent
commit
b75e2c4846
100 changed files with 1802 additions and 5044 deletions
  1. 2 2
      .env.dev.js
  2. 0 384
      components/Carmap.vue
  3. 0 39
      components/Loading.vue
  4. 4 4
      main.js
  5. 2 2
      manifest.json
  6. 1 2
      package.json
  7. 306 233
      pages.json
  8. 0 39
      pages/404/404.vue
  9. 0 39
      pages/404/500.vue
  10. 0 106
      pages/buytickets/adjust.js
  11. 0 77
      pages/buytickets/adjust.vue
  12. 0 208
      pages/buytickets/confirm.js
  13. 0 158
      pages/buytickets/confirm.vue
  14. 0 22
      pages/buytickets/edit.vue
  15. 0 344
      pages/buytickets/home.js
  16. 0 227
      pages/buytickets/home.vue
  17. 0 219
      pages/buytickets/index.js
  18. 0 183
      pages/buytickets/index.vue
  19. 0 410
      pages/buytickets/selectSite.js
  20. 0 471
      pages/buytickets/selectSite.vue
  21. 0 230
      pages/buytickets/site.js
  22. 0 230
      pages/buytickets/site.vue
  23. 0 50
      pages/buytickets/success.js
  24. 0 151
      pages/buytickets/success.vue
  25. 0 32
      pages/buytickets/upload.js
  26. 0 96
      pages/buytickets/upload.vue
  27. 0 22
      pages/buytickets/view.vue
  28. 0 138
      pages/car/login.js
  29. 0 127
      pages/car/login.vue
  30. 27 0
      pages/hr/index/index.js
  31. 16 0
      pages/hr/index/index.vue
  32. 27 0
      pages/hr/index/resumeInfo/index.js
  33. 16 0
      pages/hr/index/resumeInfo/resumeInfo.vue
  34. 16 0
      pages/hr/my/collection/collection.vue
  35. 27 0
      pages/hr/my/collection/index.js
  36. 16 0
      pages/hr/my/enroll/enroll.vue
  37. 27 0
      pages/hr/my/enroll/index.js
  38. 16 0
      pages/hr/my/follow/follow.vue
  39. 27 0
      pages/hr/my/follow/index.js
  40. 27 0
      pages/hr/my/index.js
  41. 16 0
      pages/hr/my/my.vue
  42. 27 0
      pages/hr/my/position/index.js
  43. 16 0
      pages/hr/my/position/position.vue
  44. 27 0
      pages/hr/newsIndex/index.js
  45. 16 0
      pages/hr/newsIndex/newsIndex.vue
  46. 27 0
      pages/hr/newsIndex/newsList/index.js
  47. 16 0
      pages/hr/newsIndex/newsList/newsList.vue
  48. 27 0
      pages/hr/newsIndex/newsRecommend/index.js
  49. 16 0
      pages/hr/newsIndex/newsRecommend/newsRecommend.vue
  50. 27 0
      pages/hr/newsIndex/servicesInfo/index.js
  51. 16 0
      pages/hr/newsIndex/servicesInfo/servicesInfo.vue
  52. 27 0
      pages/hr/newsIndex/servicesList/index.js
  53. 16 0
      pages/hr/newsIndex/servicesList/servicesList.vue
  54. 27 0
      pages/hr/query/index.js
  55. 16 0
      pages/hr/query/query.vue
  56. 27 0
      pages/hr/query/queryResult/index.js
  57. 16 0
      pages/hr/query/queryResult/queryResult.vue
  58. 27 0
      pages/index.js
  59. 10 390
      pages/index/index.js
  60. 20 205
      pages/index/index.vue
  61. 0 95
      pages/index/sitePage.js
  62. 0 109
      pages/index/sitePage.vue
  63. 16 0
      pages/job/index/companyInfo/companyInfo.vue
  64. 27 0
      pages/job/index/companyInfo/index.js
  65. 27 0
      pages/job/index/index.js
  66. 16 0
      pages/job/index/index.vue
  67. 27 0
      pages/job/index/recruitInfo/index.js
  68. 16 0
      pages/job/index/recruitInfo/recruitInfo.vue
  69. 27 0
      pages/job/newsIndex/index.js
  70. 27 0
      pages/job/newsIndex/newsEntry/index.js
  71. 16 0
      pages/job/newsIndex/newsEntry/newsEntry.vue
  72. 16 0
      pages/job/newsIndex/newsIndex.vue
  73. 27 0
      pages/job/newsIndex/newsInvitationBefore/index.js
  74. 16 0
      pages/job/newsIndex/newsInvitationBefore/newsInvitationBefore.vue
  75. 27 0
      pages/job/newsIndex/newsInvitationPhone/index.js
  76. 16 0
      pages/job/newsIndex/newsInvitationPhone/newsInvitationPhone.vue
  77. 27 0
      pages/job/newsIndex/newsList/index.js
  78. 16 0
      pages/job/newsIndex/newsList/newsList.vue
  79. 27 0
      pages/job/newsIndex/newsRecommend/index.js
  80. 16 0
      pages/job/newsIndex/newsRecommend/newsRecommend.vue
  81. 16 0
      pages/job/personal/about/about.vue
  82. 27 0
      pages/job/personal/about/index.js
  83. 27 0
      pages/job/personal/index.js
  84. 16 0
      pages/job/personal/install/account/account.vue
  85. 27 0
      pages/job/personal/install/account/index.js
  86. 27 0
      pages/job/personal/install/account/passwordA/index.js
  87. 16 0
      pages/job/personal/install/account/passwordA/passwordA.vue
  88. 27 0
      pages/job/personal/install/account/passwordB/index.js
  89. 16 0
      pages/job/personal/install/account/passwordB/passwordB.vue
  90. 27 0
      pages/job/personal/install/account/passwordC/index.js
  91. 16 0
      pages/job/personal/install/account/passwordC/passwordC.vue
  92. 27 0
      pages/job/personal/install/account/phoneA/index.js
  93. 16 0
      pages/job/personal/install/account/phoneA/phoneA.vue
  94. 27 0
      pages/job/personal/install/account/phoneB/index.js
  95. 16 0
      pages/job/personal/install/account/phoneB/phoneB.vue
  96. 27 0
      pages/job/personal/install/account/phoneC/index.js
  97. 16 0
      pages/job/personal/install/account/phoneC/phoneC.vue
  98. 27 0
      pages/job/personal/install/index.js
  99. 16 0
      pages/job/personal/install/install.vue
  100. 27 0
      pages/job/personal/install/myInfo/index.js

+ 2 - 2
.env.dev.js

@@ -3,8 +3,8 @@ const UNI_APP = {
     BASE_URL: 'https://ykt-test.xiaoxinda.com/smart-bus-server/' ,
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   , 用于样式人员快速访问各种功能 ,快速测试等
-	//企业联合会微信appid
-	VUE_APP_WXAPPID:"wx93675268c87a5a46"
+	//小鹏管家appid
+	VUE_APP_WXAPPID:"wx7e70eb62a8459869"
 }  
 
 module.exports = UNI_APP;

+ 0 - 384
components/Carmap.vue

@@ -1,384 +0,0 @@
-<template>
-	<view>
-		<view id="container" :style="myStyle"></view>
-	
-			<u-icon name="map-fill" v-if="false" class="input-card"  style="width: 24rem;top: 130px;width: 20px;height: 20px;" color="#999" size="40"></u-icon>
-			
-	</view>
-</template>
-
-<script>
-		import MapLoader from '@/utils/AMap'
-	export default {
-		name:"Carmap",
-		
-		data() {
-			return {
-				myStyle:"width: 100%; height: 140px;",
-				longitude: 112.276527,
-				latitude: 30.306427,
-				AMap:null,
-				//车的位置
-				car: {
-					obj:null,
-					longitude: '',
-					latitude: '',
-				},
-				down: {
-					obj:null,
-					longitude: '',
-					latitude: '',
-				},
-				up: {
-					obj:null,
-					longitude: '',
-					latitude: '',
-				},
-				//个人
-				info: {
-					obj:null,
-					init: false,
-					longitude: '',
-					latitude: '',
-				},
-				mapbus:null,
-				startend: [{
-					longitude:112.279274,
-					latitude:30.303273,
-					name:''
-				}, {
-					longitude:112.273867,
-					latitude:30.309817,
-					name:''
-				}], 
-				start:{},
-				end:{},
-				carList:[],
-				covers: [
-					{
-						longitude:112.273867,
-						latitude:30.309817,
-					},{
-						longitude:112.280261,
-						latitude:30.3041,
-					},{
-						longitude:112.279274,
-						latitude:30.303273,
-					}
-				]
-			};
-		},
-		methods:{
-			setCarList(sz){
-					
-					if(this.AMap==null){
-						return
-					}
-					for(var i in this.carList){
-						this.mapbus.remove(this.carList[i]);
-					}
-					var icon0 = require("@/static/img/icon-busPosition.png");
-					
-					this.carList=[]
-					for(var i in sz){
-						var ob=sz[i];
-						var ob1=new AMap.Marker({
-							map: this.mapbus,
-							position: [ob.longitude,ob.latitude],
-							//offset: new AMap.Pixel(-5, -5),
-							offset: new AMap.Pixel(-18, -40),
-							content:"<img src='"+icon0+"' style='height: 40px;width: 40px' />",
-							
-							zIndex:900,
-							autoRotation: true,
-						});
-						
-						 this.myEmit("car",ob1,ob)
-						
-						
-						this.carList.push(ob1)
-					}
-					
-			},
-			myEmit(type,ob1,obj){
-				var _this=this;
-				AMap.event.addListener(ob1, 'click', function(e) {
-					_this.$emit('clickMap',{
-						type:type,
-						obj:obj
-					})						
-				})
-				
-			},
-			setMyStyle(s){
-				this.myStyle=s;
-			},
-			setStartend(sz){
-				this.start.setPosition( [sz[0].longitude,sz[0].latitude]);
-			this.end.setPosition( [sz[sz.length-1].longitude,sz[sz.length-1].latitude]);
-			
-			},
-			setCenter(item){
-				if(this.mapbus){
-					this.mapbus.setCenter([item.longitude,item.latitude]);
-					return true
-				}else{
-					return false
-				}
-			},
-			setSite(ob){
-				if(this.AMap==null){
-					return
-				}
-				this.down.longitude=ob.longitude
-				this.down.latitude=ob.latitude
-				if(!this.down.ob){
-					
-					var icon0 = require("@/static/img/map_4.png");
-					
-					this.down.ob= new AMap.Marker({
-						map: this.mapbus,
-						position: [this.down.longitude,this.down.latitude],
-						offset: new AMap.Pixel(-15, -30),
-						content:"<img src='"+icon0+"' style='height: 30px;width: 30px' />",
-						
-						zIndex:999,
-						autoRotation: true,
-					});
-					
-				}else{
-					this.down.ob.setPosition( [this.down.longitude,this.down.latitude]);
-				}
-			},
-			setDown(ob){
-				if(this.AMap==null){
-					return
-				}
-				this.down.longitude=ob.longitude
-				this.down.latitude=ob.latitude
-				if(!this.down.ob){
-					
-					var icon0 = require("@/static/img/down.png");
-					
-					this.down.ob= new AMap.Marker({
-						map: this.mapbus,
-						position: [this.down.longitude,this.down.latitude],
-						offset: new AMap.Pixel(-15, -30),
-						content:"<img src='"+icon0+"' style='height: 30px;width: 30px' />",
-						
-						zIndex:999,
-						autoRotation: true,
-					});
-					
-				}else{
-					this.down.ob.setPosition( [this.down.longitude,this.down.latitude]);
-				}
-			},
-			setUp(ob){
-				if(this.AMap==null){
-					return
-				}
-				this.up.longitude=ob.longitude
-				this.up.latitude=ob.latitude
-				if(!this.up.ob){
-					
-					var icon0 = require("@/static/img/up.png");
-					
-					this.up.ob= new AMap.Marker({
-						map: this.mapbus,
-						position: [this.up.longitude,this.up.latitude],
-						offset: new AMap.Pixel(-15, -30),
-						
-						
-						content:"<img src='"+icon0+"' style='height: 30px;width: 30px' />",
-						
-						zIndex:999,
-						autoRotation: true,
-					});
-					
-				}else{
-					this.up.ob.setPosition( [this.up.longitude,this.up.latitude]);
-				}
-			},
-			setCar(ob){
-				if(this.AMap==null){
-					return
-				}
-				 this.car.longitude=ob.longitude
-				 this.car.latitude=ob.latitude
-				 if(!this.car.ob){
-				 	
-				 	var icon0 = require("@/static/img/icon-busPosition.png");
-				 	
-				 	this.car.ob= new AMap.Marker({
-				 		map: this.mapbus,
-				 		position: [this.car.longitude,this.car.latitude],
-				 		offset: new AMap.Pixel(-18, -40),
-				 		content:"<img src='"+icon0+"' style='height: 40px;width: 40px' />",
-				 		
-				 		zIndex:900,
-				 		autoRotation: true,
-				 	});
-					var _this=this;
-					 
-					 this.myEmit("car",this.car.ob,ob)
-				 	
-				 }else{
-				 	this.car.ob.setPosition( [this.car.longitude,this.car.latitude]);
-				 }
-			 
-				
-			},
-			setPerson(ob,bl){
-				if(this.AMap==null){
-					return
-				}
-				
-					this.info.longitude=ob.longitude
-					this.info.latitude=ob.latitude
-					if(!this.info.ob){
-						
-						var icon0 = require("@/static/img/icon-userPosition.png");
-						
-						
-						this.info.ob= new AMap.Marker({
-							map: this.mapbus,
-							position: [this.info.longitude,this.info.latitude],
-							//offset: new AMap.Pixel(-5, -5),
-								offset: new AMap.Pixel(-15, -30),
-							content:"<img src='"+icon0+"' style='height: 30px;width: 30px' />",
-							
-							zIndex:99,
-							autoRotation: true,
-						});
-						//this.mapbus.setCenter([this.info.longitude,this.info.latitude]); //设置地图中心点
-						if(!bl){
-							this.mapbus.setCenter([ this.info.longitude,this.info.latitude]); //设置地图中心点
-						}
-
-					}else{
-						this.info.ob.setPosition( [this.info.longitude,this.info.latitude]);
-					}
-				
-				
-			},
-			init(){
-					var _this = this;
-				MapLoader().then(AMap => {
-					
-					this.AMap=AMap;
-					_this.mapbus && _this.mapbus.destroy();
-				
-					_this.mapbus=new AMap.Map("container", {
-						resizeEnable: true,
-						center: [this.longitude, this.latitude],
-						zoom: 14
-					});
-					this.$emit('onload')
-				}, e => {
-					//_this.mui.toast('地图加载失败');
-					console.log('地图加载失败', e)
-				})
-			},
-			initMap(point,stationList,startend){
-				
-				var _this = this;
-				this.covers=point;
-				this.startend=startend;
-				MapLoader().then(AMap => {
-					
-					this.AMap=AMap;
-					_this.mapbus && _this.mapbus.destroy();
-				
-					_this.mapbus=new AMap.Map("container", {
-						resizeEnable: true,
-						center: [this.longitude, this.latitude],
-						zoom: 14
-					});
-					var lineArr=[]
-					var icon0 = require("@/static/img/map_0.png");
-					var icon1 = require("@/static/img/map_1.png");
-					var icon2 = require("@/static/img/map_2.png");
-					this.start=new AMap.Marker({
-						map: _this.mapbus,
-						position: [_this.startend[0].longitude,_this.startend[0].latitude],
-						content:"<img src='"+icon0+"' style='height: 30px;width: 30px' />",
-						offset: new AMap.Pixel(-15, -30),
-						zIndex:99,
-						autoRotation: true,
-					});
-					this.end=new AMap.Marker({
-						map: _this.mapbus,
-						position: [_this.startend[1].longitude,_this.startend[1].latitude],
-					content:"<img src='"+icon2+"' style='height: 30px;width: 30px' />",
-					offset: new AMap.Pixel(-15, -30),
-					zIndex:99,
-						autoRotation: true,
-					});
-					for(var i in _this.covers){
-						var point=_this.covers[i]
-						lineArr.push([point.longitude,point.latitude])
-						
-					}
-					for(var i in stationList){
-						var point=stationList[i]
-						var ob_point =new AMap.Marker({
-							map: _this.mapbus,
-							position: [point.longitude,point.latitude],
-							offset: new AMap.Pixel(-5, -7),
-							content:"<img src='"+icon1+"' style='height: 10px;width: 10px' />",
-							zIndex:99,
-							autoRotation: true,
-						});
-						this.myEmit("point",ob_point,point)
-					}
-					var polyline = new AMap.Polyline({
-						map: _this.mapbus,
-						path: lineArr,
-						showDir: true,
-						strokeColor: "#28F", //线颜色
-						// strokeOpacity: 1,     //线透明度
-						strokeWeight: 3, //线宽
-						//strokeStyle: "solid"  //线样式
-					});
-					
-					this.$emit('onload')
-				}, e => {
-					//_this.mui.toast('地图加载失败');
-					console.log('地图加载失败', e)
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped>
-/*去除下标*/
-.amap-logo{
-display: none;
-}
-.amap-copyright{
-opacity:0;
-    font-size: 1px;
-}
-
-.input-card {
-  display: flex;
-  flex-direction: column;
-  min-width: 0;
-  word-wrap: break-word;
-  background-color: #fff;
-  background-clip: border-box;
-  border-radius: .25rem;
-  width: 22rem;
-  border-width: 0;
-  border-radius: 0.4rem;
-  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
-  position: fixed;
-  bottom: 1rem;
-  right: 1rem;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  padding: 0.75rem 0.75rem;
-}
-</style>

+ 0 - 39
components/Loading.vue

@@ -1,39 +0,0 @@
-<template>
-	<view>
-		<view  class="z-loading">
-			<view class="div">
-				<img src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/img/xxd_loading.gif" />
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"Loading",
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-
-<style>
-.z-loading {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgb(255, 255, 255, 0.9);
-		z-index: 999;
-	}
-
-	.z-loading .div {
-		top: 40%;
-		position: absolute;
-		left: 40%
-	}
-</style>

+ 4 - 4
main.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import App from './App'
-import CarCommon from '@/components/Common.vue'
-import CarLoading from '@/components/Loading.vue'
+import MyCommon from '@/components/Common.vue'
+//import CarLoading from '@/components/Loading.vue'
 
 import  mixin from './utils/mixin.js'
 Vue.config.ignoredElements.push("wx-open-subscribe") ;
@@ -23,8 +23,8 @@ const app = new Vue({
 
     ...App
 })
-Vue.component('car-common',CarCommon)
-Vue.component('car-loading',CarLoading)
+Vue.component('my-common',MyCommon)
+//Vue.component('car-loading',CarLoading)
 
 
 Vue.use(mixin)

+ 2 - 2
manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "jp-car-phone",
-    "appid" : "__UNI__BA634F5",
+    "name" : "jp-employment-kfq",
+    "appid" : "__UNI__B831E6D",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

+ 1 - 2
package.json

@@ -6,9 +6,8 @@
   "test": "vue-cli-service build --mode test"
  },
  "dependencies": {
-  "compression-webpack-plugin": "^7.1.2",
+  "compression-webpack-plugin": "^8.0.1",
   "uni-crazy-router": "0.0.31",
-  "uni-read-pages": "^1.0.5",
   "uni-simple-router": "^2.0.1",
   "uview-ui": "^1.8.4",
   "vconsole": "^3.4.0",

+ 306 - 233
pages.json

@@ -13,391 +13,464 @@
 			}
 		}
 
-        ,{
-			//注册/登录
-			"name":"CarLogin",
-            "path" : "pages/car/login",
+      
+        ,{//微信登录
+            "path" : "pages/login/wxLogin/wxLogin",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "登录",
-                "enablePullDownRefresh": false
+                
             }
             
         }
-        ,{
-			//路线详情
-            "path" : "pages/route/index",
+        ,{//手机号登录
+            "path" : "pages/login/phoneLogin/phoneLogin",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "路线详情",
+                
+            }
+            
+        }
+        ,{//填写验证码
+            "path" : "pages/login/vCode/vCode",
+            "style" :                                                                                    
+            {           
+                
+            }
+            
+        }
+        ,{//密码登录
+            "path" : "pages/login/passwordLogin/passwordLogin",
+            "style" :                                                                                    
+            {              
+                
+            }
+            
+        }
+      
+        ,{
+            "path" : "pages/job/index/index",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "求职主页",
                 "enablePullDownRefresh": false
             }
             
         }
-       
-        ,{
-			//添加乘车人
-            "path" : "pages/buytickets/index",
-			
+        ,{
+            "path" : "pages/job/index/recruitInfo/recruitInfo",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "添加乘车人",
+                "navigationBarTitleText": "招聘详情",
                 "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			//上传图片
-            "path" : "pages/buytickets/selectSite",
+        ,{
+            "path" : "pages/job/index/companyInfo/companyInfo",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "选择站点",
+                "navigationBarTitleText": "企业详情",
                 "enablePullDownRefresh": false
             }
             
-        },
-		{
-			//上传图片
-		    "path" : "pages/buytickets/upload",
-		    "style" :                                                                                    
-		    {
-		       // "navigationBarTitleText": "上传图片",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-			//调整图片
-            "path" : "pages/buytickets/adjust",
+        }
+        ,{
+            "path" : "pages/job/query/query",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "调整图片",
+                "navigationBarTitleText": "搜索",
                 "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			//确认身份
-            "path" : "pages/buytickets/confirm",
+        ,{
+            "path" : "pages/job/query/queryResult/queryResult",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "确认身份",
+                "navigationBarTitleText": "搜索结果",
                 "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			//选择站点
-            "path" : "pages/buytickets/site",
+        ,{
+            "path" : "pages/job/newsIndex/newsIndex",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "选择站点",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom" // 隐藏系统导航栏
+                "navigationBarTitleText": "分类消息",
+                "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			//购买成功
-            "path" : "pages/buytickets/success",
+        ,{
+            "path" : "pages/job/newsIndex/newsList/newsList",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "购买成功",
+                "navigationBarTitleText": "消息列表",
                 "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			//搜索
-            "path" : "pages/query/index",
+        ,{
+            "path" : "pages/job/newsIndex/newsRecommend/newsRecommend",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "搜索",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom" // 隐藏系统导航栏
+                "navigationBarTitleText": "推荐职位",
+                "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			//搜索结果
-            "path" : "pages/query/record",
+        ,{
+            "path" : "pages/job/newsIndex/newsInvitationPhone/newsInvitationPhone",
             "style" :                                                                                    
             {
-               // "navigationBarTitleText": "搜索结果",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom" // 隐藏系统导航栏
+                "navigationBarTitleText": "沟通邀请通知",
+                "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			 //消息
-            "path" : "pages/news/index",
+        ,{
+            "path" : "pages/job/newsIndex/newsInvitationBefore/newsInvitationBefore",
             "style" :                                                                                    
             {
-
-               // "navigationBarTitleText": "消息",
+                "navigationBarTitleText": "面试邀请通知",
                 "enablePullDownRefresh": false
-
             }
             
         }
-		,{
-			 //消息
-		    "path" : "pages/news/details",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "消息详情",
-		        "enablePullDownRefresh": false
-				
-		    }
-		    
-		}
-		,{
-			//我的
-		    "path" : "pages/my/index",
-		    "style" :                                                                                    
-		    {
-
-		        "navigationBarTitleText": "我的",
-		        "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-		    }
-		    
-		}
-        ,{
-			//意见反馈
-            "path" : "pages/my/user/feedback",
+        ,{
+            "path" : "pages/job/newsIndex/newsEntry/newsEntry",
             "style" :                                                                                    
             {
-
-               // "navigationBarTitleText": "",
-
+                "navigationBarTitleText": "录用意向书详情",
                 "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			//乘车记录
-            "path" : "pages/my/user/bybusList",
+        ,{
+            "path" : "pages/job/personal/personal",
             "style" :                                                                                    
             {
-
-               // "navigationBarTitleText": "",
-
+                "navigationBarTitleText": "个人中心",
                 "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			//问题反馈
-            "path" : "pages/my/platform/opinion",
+        ,{
+            "path" : "pages/job/personal/my/my",
             "style" :                                                                                    
             {
-
-               // "navigationBarTitleText": "",
-
+                "navigationBarTitleText": "我的",
                 "enablePullDownRefresh": false
             }
             
         }
-        ,{
-			//关于平台
-            "path" : "pages/my/platform/about",
+     
+        ,{
+            "path" : "pages/job/personal/my/resumeMy/resumeMy",
             "style" :                                                                                    
             {
-
-               // "navigationBarTitleText": "",
-
+                "navigationBarTitleText": "我的简历",
                 "enablePullDownRefresh": false
             }
             
         }
-       
-        ,{
-			//修改密码 -验证
-            "path" : "pages/my/user/resetpassword/verification",
+        ,{
+            "path" : "pages/job/personal/my/resumeAdd/resumeAdd",
             "style" :                                                                                    
             {
-
-               // "navigationBarTitleText": "",
-
+                "navigationBarTitleText": "创建简历",
                 "enablePullDownRefresh": false
             }
             
         }
 		,{
-			//修改密码 -修改
-		    "path" : "pages/my/user/resetpassword/change",
+		    "path" : "pages/job/personal/my/resumeAdd/resumeSelect/resumeSelect",
 		    "style" :                                                                                    
 		    {
-
-		       // "navigationBarTitleText": "",
-
+		        "navigationBarTitleText": "选择职位输入",
 		        "enablePullDownRefresh": false
 		    }
 		    
 		}
 		,{
-			//修改手机号 - 绑定手机号
-		    "path" : "pages/my/user/updatephone/index",
+		    "path" : "pages/job/personal/my/resumeAdd/resumeEdit/resumeEdit",
 		    "style" :                                                                                    
 		    {
- // "navigationBarTitleText": "",
+		        "navigationBarTitleText": "编辑自我介绍",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+		,{
+		    "path" : "pages/job/personal/my/resumeAdd/resumeSucc/resumeSucc",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "简历提交成功",
 		        "enablePullDownRefresh": false
 		    }
 		    
 		}
-        ,{
-			//修改手机号 - 验证手机号
-            "path" : "pages/my/user/updatephone/verification",
+        ,{
+            "path" : "pages/job/personal/my/resumeList/resumeList",
             "style" :                                                                                    
             {
- // "navigationBarTitleText": "",
+                "navigationBarTitleText": "投递记录",
                 "enablePullDownRefresh": false
             }
             
         }
-       
-        ,{
-			//修改手机号 - 更新手机号
-            "path" : "pages/my/user/updatephone/change",
+        ,{
+            "path" : "pages/job/personal/my/resumeLook/resumeLook",
             "style" :                                                                                    
             {
- // "navigationBarTitleText": "",
+                "navigationBarTitleText": "看过的职位",
                 "enablePullDownRefresh": false
             }
-			
             
-        },
-		{
-			"path": "pages/404/404",
-			"name": "404",
-			 "style" : 
-			{
-			    "navigationBarTitleText": "网页无法打开",
-			    "enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/404/500",
-			"name": "500",
-			 "style" : 
-			{
-			    "navigationBarTitleText": "服务器错误",
-			    "enablePullDownRefresh": false
-			}
+        }
+        ,{
+            "path" : "pages/job/personal/my/resumeCollect/resumeCollect",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "职位收藏",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/job/personal/my/resumeAuth/resumeAuth",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "个人认证",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+		,{
+		    "path" : "pages/job/personal/install/install",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "设置",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
-        
         ,{
-            "path" : "pages/my/user/updateinfo",
+            "path" : "pages/job/personal/install/myInfo/myInfo",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "个人信息",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/buytickets/home",
+            "path" : "pages/job/personal/install/account/account",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "账号管理",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/buytickets/view",
+            "path" : "pages/job/personal/install/account/passwordA/passwordA",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "忘记密码",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/buytickets/edit",
+            "path" : "pages/job/personal/install/account/passwordB/passwordB",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "验证码找回",
                 "enablePullDownRefresh": false
             }
             
-        },
-		{
-		    "path" : "pages/remind/index",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/index/sitePage",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/my/user/bybusDetails",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},{
-            "path" : "pages/my/platform/help",
+        }
+        ,{
+            "path" : "pages/job/personal/install/account/passwordC/passwordC",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "重设密码",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/job/personal/install/account/phoneA/phoneA",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "填写验证码",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/job/personal/install/account/phoneB/phoneB",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "绑定手机号",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/job/personal/install/account/phoneC/phoneC",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "绑定验证码 Copy",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/job/personal/about/about",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "关于我们",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/index/index",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "招聘主页",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/index/resumeInfo/resumeInfo",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "简历详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/query/query",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "搜索",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/query/queryResult/queryResult",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "搜索结果",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/newsIndex/newsIndex",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "消息分类",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/newsIndex/newsList/newsList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "消息列表",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/newsIndex/newsRecommend/newsRecommend",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "推荐简历",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+       
+        ,{
+            "path" : "pages/hr/newsIndex/servicesList/servicesList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "劳务对接列表",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/newsIndex/servicesInfo/servicesInfo",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "劳务对接详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/my/my",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/my/position/position",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "职位管理",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/my/follow/follow",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "对您感兴趣",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/my/enroll/enroll",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "求职管理",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/hr/my/collection/collection",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收藏简历",
                 "enablePullDownRefresh": false
             }
             
         }
     ],
-	"condition": { //模式配置,仅开发期间生效
-	        "current": 0, //当前激活的模式(list 的索引项)
-	        "list": [{
-	            "name": "test", //模式名称
-	            "path": "pages/buytickets/index" //启动页面,必选
-	        }]
-	    },
+	 
 	"globalStyle": {
 			"navigationStyle": "custom" // 隐藏系统导航栏
-			,"navigationBarTitleText": "车信达"
+			,"navigationBarTitleText": "荆开就业在线",
+			"navigationBarTitleText": "",
+			"enablePullDownRefresh": false
 			
-	},
-	"tabBar": {
-	    "color": "#7A7E83",
-	    "selectedColor": "#4b96ff",
-	    "borderStyle": "black",
-	    "backgroundColor": "#ffffff",
-	    "list": [{
-	        "pagePath": "pages/index/index",
-	        "iconPath": "static/img/index-bus-1.png",
-	        "selectedIconPath": "static/img/index-bus-2.png",
-	        "text": "主页"
-	    }, {
-	        "pagePath": "pages/remind/index",
-	        "iconPath": "static/img/index-remind-1.png",
-	        "selectedIconPath": "static/img/index-remind-2.png",
-	        "text": "提醒"
-	    },
-		{
-	        "pagePath": "pages/news/index",
-	        "iconPath": "static/img/index-news-1.png",
-	        "selectedIconPath": "static/img/index-news-2.png",
-	        "text": "消息"
-	    }, {
-	        "pagePath": "pages/my/index",
-	        "iconPath": "static/img/index-my-1.png",
-	        "selectedIconPath": "static/img/index-my-2.png",
-	        "text": "我的"
-	    }]
-	}
+	}
+	 
 }

+ 0 - 39
pages/404/404.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="error">
-		<img src="static/img/404.png" alt="">
-		<h4>抱歉!您要查看的页面无法打开</h4>
-		<u-button type="primary"  shape="circle" plain>返回首页</u-button>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		onLoad(...options){
-			console.log(options)
-			console.log(this.$Route)
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.error{
-		text-align: center;
-		padding: 50px;
-		img{
-			width: 300px;
-		}
-		h4{
-			font-weight: normal;
-			font-size: 16px;
-			margin-bottom: 20px;
-		}
-	}
-</style>

+ 0 - 39
pages/404/500.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="error">
-		<img src="static/img/500.png" alt="">
-		<h4>抱歉!服务器出错了~</h4>
-		<u-button type="primary"  shape="circle" plain>返回首页</u-button>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		onLoad(...options){
-			console.log(options)
-			console.log(this.$Route)
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.error{
-		text-align: center;
-		padding: 50px;
-		img{
-			width: 300px;
-		}
-		h4{
-			font-weight: normal;
-			font-size: 16px;
-			margin-bottom: 20px;
-		}
-	}
-</style>

+ 0 - 106
pages/buytickets/adjust.js

@@ -1,106 +0,0 @@
-import {
-	VueCropper
-} from 'vue-cropper'
-import * as WxJsApi from '@/utils/wxJsApi.js'
-	import {
-		dataUrlToFile
-	} from '@/utils'
-import * as API_Common from '@/apis/common'
-
-export default {
-	data() {
-		return {
-			localId:'',
-			imgBase64: '',
-			cropper: {
-
-				//img的路径自行修改
-				img: '',
-				info: true,
-				size: 0.8,
-				outputType: 'jpeg',
-				canScale: false,
-				autoCrop: true,
-				// 只有自动截图开启 宽度高度才生效
-				autoCropWidth: 250,
-				autoCropHeight: 350,
-				fixed: true,
-				// 真实的输出宽高
-				infoTrue: true,
-				fixedNumber: [5, 7],
-				fixedBox:true
-
-			},
-		}
-	},
-	components: {
-		VueCropper,
-	},
-	methods: {
-		//上传图片
-		uploadpic() {
-			this.$refs.common.showLoading()
-			var _this = this;
-			var formData = {
-				'photoName': '1.jpg',
-				'photoFile': this.imgBase64
-			}
-			
-			API_Common.upload(formData).then(response => {
-				
-				var obj=this.carhelp.get("form");
-				obj.pic=response.data;
-				this.carhelp.set("form",obj);
-				this.$refs.common.showLoading(false,"上传成功!")
-				
-				uni.navigateTo({
-					url: '/pages/buytickets/confirm'
-				})
-			}).catch(error => {
-				this.$refs.common.showLoading(false,error)
-		
-			})
-		},
-		submit(){
-			this.$refs.cropper.goAutoCrop();
-			this.$refs.cropper.getCropData((data) => {
-				this.modelSrc = data
-				this.model = false;
-				//裁剪后的图片显示
-				//this.cropper.img = data;
-				//console.log(data)
-				this.imgBase64=data;
-				this.uploadpic();
-			})
-		},
-		close(){
-			step=1;
-		},
-		rotateRight(){
-			this.$refs.cropper.rotateRight()
-		},
-		getData(res) {
-			var localData = res.localData
-			if (localData.indexOf('data:image') != 0) {
-				//判断是否有这样的头部
-				localData = 'data:image/jpeg;base64,' + localData
-			}
-			localData = localData.replace(/\r|\n/g, '').replace('data:image/jgp', 'data:image/jpeg')
-			this.imgBase64 = localData;
-			this.cropper.img=localData;
-			this.$refs.common.showLoading();
-		},imgLoad(){
-			this.$refs.common.showLoading(false);
-		}
-	},
-	onLoad(obj) {
-		this.localId = obj.localId;
-		
-	},onReady() {
-		this.$refs.common.showLoading()
-			 WxJsApi.getWxConfig([ 'getLocalImgData']).then(() => {
-			 
-			 	WxJsApi.getLocalImgData(this.localId, this.getData);
-			 });
-		}
-}

+ 0 - 77
pages/buytickets/adjust.vue

@@ -1,77 +0,0 @@
-<template>
-	<view>
-		<car-common   mytitle="调整照片" ref="common"></car-common>
-		
-		<view class="adjust-img">
-		 
-			<vueCropper ref="cropper" :img="cropper.img " :outputSize="cropper.size" :outputType="cropper.outputType" :info="cropper.info"
-			 :canScale="cropper.canScale" :autoCrop="cropper.autoCrop" :autoCropWidth="cropper.autoCropWidth" :autoCropHeight="cropper.autoCropHeight"
-			 :fixed="cropper.fixed"  :fixedBox="cropper.fixedBox" :fixedNumber="cropper.fixedNumber"  @imgLoad="imgLoad" :enlarge="4"></vueCropper>
-			 
-		</view>
-		<view class="adjust-btn">
-			<u-button type="primary" size="medium" shape="circle" @click="rotateRight()">旋转</u-button>
-			<u-button type="error" size="medium" shape="circle" @click="submit()">确定</u-button>
-			
-		</view>
-		
-		<view class="adjust-text">
-			<p>1.照片仅用于乘车时人脸识别设备的验证,请上传清晰现场拍摄的肩部半身照;</p>
-			<p>2.可拖动、旋转或缩放照片,将人脸区域调整至轮廓框以内。</p>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from './adjust.js'
-	export default api;
-</script>
-
-<style>
-	page{
-		background-color: #000;
-	}
-</style>
-<style scoped lang="scss">
-	.adjust-img{
-		position: relative;
-		height: 240px;
-		width: 240px;
-		margin:50px auto;
-		img{
-			height: 100%;
-			width: 100%;
-		}
-	}
-	.adjust-btn{
-		display: flex;
-		justify-content: space-between;
-	}
-	.adjust-text{
-		padding:60rpx;
-		p{
-			color:#888;
-			margin-bottom: 10rpx;
-		}
-	}
-	.adjust-icon{
-		background-color: #fff;
-		width: 20px;
-		height: 20px;
-		border-radius: 50%;
-		position: absolute;
-		right: -10px;
-		top: -10px;
-		text-align: center;
-	}
-	.adjust-icon2{
-		background-color: #fff;
-		width: 20px;
-		height: 20px;
-		border-radius: 50%;
-		position: absolute;
-		right: -10px;
-		bottom: -10px;
-		text-align: center;
-	}
-</style>

+ 0 - 208
pages/buytickets/confirm.js

@@ -1,208 +0,0 @@
-import * as API from '@/apis/buytickets.js'
-
-
-export default {
-	data() {
-		return {
-			noback:true,
-			id: '',
-			num: 0,
-			pic: '',
-			list: [],
-			selectList: [],
-			subForm: {
-				pageIndex: 1,
-				pageSize: 20,
-				totalPage: 1
-			}
-		}
-	},
-	methods: {
-		gotoHome(){
-			uni.switchTab({
-			    url: '/pages/index/index'
-			});
-		},
-	
-		submit() {
-			var obj = this.carhelp.get("form");
-			obj.oplist = []
-			for (var i in this.list) {
-				if (this.list[i].ck) {
-					obj.oplist.push(this.list[i]);
-				}
-			}
-			this.carhelp.set("form", obj);
-
-			uni.navigateTo({
-				url: '/pages/buytickets/selectSite?id=' + this.id
-			})
-		},
-		ckBtn(item) {
-			item.ck = !item.ck;
-
-			if (item.ck) {
-				var bl=true
-				for (var i = 0; i < this.selectList.length; i++) {
-					if (this.selectList[i].upStationId != item.upStationId) {
-						bl=false;
-					
-					}
-					break;
-				}
-				if(!bl){
-					item.ck = !item.ck;
-					this.$refs.common.alert("所选乘客上车站点不一致,请重新选择。");
-					return;
-				}
-				this.num++;
-				this.selectList.push(item);
-			} else {
-				this.num--;
-				for (var i = 0; i < this.selectList.length; i++) {
-					if (this.selectList[i].id == item.id) {
-						this.selectList.splice(i, 1);
-					}
-				}
-			}
-			console.log(this.selectList)
-		},
-		getPassengerInfo() {
-			
-			
-			var thisform = {
-				id: this.id,
-				openId: this.carhelp.getOpenId()
-			}
-			this.$refs.common.showLoading()
-		
-			API.getPassengerInfo(thisform).then((response) => {
-				if (!response.result) {
-					this.$refs.common.goError(response.message)
-					return
-				}
-				this.passengerInfo = response.data
-				
-				
-		
-				var obj = this.carhelp.get("form");
-				if(!obj){
-					obj={}
-				}
-				obj.list = this.passengerInfo.list;
-				obj.name= 'buytickets';
-				obj.id= this.id;
-				this.carhelp.set("form", obj);
-				
-				if (response.data.supply) {
-					//this.$refs.common.goError(response.message)
-					this.$refs.common.setFnc(()=>{
-						uni.switchTab({
-							url: '/pages/news/index'
-						});
-					},()=>{
-						if (!response.data.id) {
-							uni.redirectTo({
-								url: '/pages/buytickets/index?id=' + this.id+'&back=true'
-							})
-						} else {
-							
-							this.getShiftInfo()
-						}
-					})
-					this.$refs.common.confirm('存在需要补票的订单,是否前去查看?')
-				return;
-				}
-				if (!response.data.id) {
-					uni.redirectTo({
-						url: '/pages/buytickets/index?id=' + this.id+'&back=true'
-					})
-				} else {
-	
-					this.upBusNoTicketList();
-				}
-			}).catch(error => {
-		
-				if (error) {
-					this.$refs.common.goError(error)
-					return
-				}
-				//this.$refs.common.showLoading(false,error)
-			})
-		},
-		upBusNoTicketList() {
-			this.$refs.common.showLoading();
-			this.subForm.id = this.id;
-			var obj = this.carhelp.get("form")
-			this.list = [];
-			API.upBusNoTicketList(this.subForm).then((res) => {
-
-				var list = res.data.data;
-				if(!list.length){
-					this.$refs.common.alert2("无照片,请上车刷脸或联系司机");
-					return;
-				}
-				
-				for (var i in list) {
-					list[i].show = true;
-					list[i].ck = false;
-					for (var j in obj.list) {
-						if (obj.list[j].id == list[i].id) {
-							list[i].show = false;
-							break;
-						}
-					}
-					if (list[i].show) {
-						this.list.push(list[i]);
-					}
-				}
-				this.selectList=[];//清空选中
-				if (this.list.length != 0) {
-					this.$refs.common.showLoading(false, "刷新成功");
-				} else {
-					this.$refs.common.showLoading(false);
-				}
-
-
-
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-
-			})
-		}
-	},
-	onLoad(op) {
-		if(op.back){
-			this.noback=!op.back
-		}
-		this.id = op.id
-	},
-	onReady() {
-
-		if (!this.id) {
-			this.$refs.common.goError()
-		}
-		var obj = this.carhelp.get("form")
-
-		if (obj && obj.name == 'buytickets' && obj.id == this.id) {
-			//不创建新订单
-		} else {
-			this.carhelp.set("form", {
-				name: 'buytickets',
-				id: this.id,
-				oplist: [], //当前添加的2人
-				list: [] // 一共添加的人 
-			});
-		}
-
-		if (false&&!this.carhelp.getPersonInfo()) {
-			this.$refs.common.setFnc(this.confirmBtn)
-			this.$refs.common.alert2('您还不是车信达用户,注册后再购买车票。', '前往注册', '尚未注册')
-		} else {
-		}
-			this.getPassengerInfo()
-			
-
-
-	}
-}

+ 0 - 158
pages/buytickets/confirm.vue

@@ -1,158 +0,0 @@
-<template>
-	<view>
-		<car-common   ref="common"></car-common>
-		
-		<u-navbar title="确认身份"  :is-back="noback">
-			<view class="slot-wrap"></view>
-			<view class="navbar-right"  @click="gotoHome" v-if="!noback" >
-				<u-icon name="home-fill" color="#999" size="28"></u-icon>
-				<span >前往首页</span>
-			</view>
-		</u-navbar>
-		
-		<view class="confirm">
-		
-			<h3 v-if="list.length">请选择购票人的照片?</h3>
-			<p v-show="!num">一位乘客仅需选择一张照片</p>
-			<p v-show="num">如需为您的同伴购票请同时选中Ta的照片</p>
-			<view class="confirm-pic" v-if="list.length">
-				<template v-for="item in list">
-					<view class="confirm-pic-item "   :class="item.ck?'active':''" @click="ckBtn(item)" >
-						<img :src="item.imageUrl+'?x-oss-process=image/resize,h_800,m_lfit/auto-orient,1'" alt="">	
-					</view>
-				</template>	 
-			</view>
-		</view>
-		 
-		<view class="upload-button" >
-			<view class="reset-btn" @click="upBusNoTicketList">
-				<u-icon name="shuaxin" custom-prefix="custom-icon" color="#2979ff" size="36"></u-icon>
-			</view>
-			
-			<view class="submit-btn" v-show="num">
-				<u-button type="primary" shape="circle" @click="submit">确定</u-button>
-			</view>
-			
-			<view class="submit-btn" v-show="!num">
-				<u-button class="gray-btn" type="default" shape="circle" >请选择</u-button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from './confirm.js'
-	export default api;
-</script>
-
-<style scoped lang="scss">
-	.confirm{
-		margin-top: 20px;
-		.confirm-img{
-			height: 240px;
-			width: 240px;
-			border-radius: 50%;
-			overflow: hidden;
-			border:4px solid #1677ff;
-			img{
-				height: 100%;
-				width: 100%;
-			}
-		}
-		.confirm-img-border{
-			border: 2px solid #fff;
-			height: 244px;
-			width: 244px;
-			border-radius: 50%;
-		}
-		.confirm-img-border2{
-			border: 2px solid #7fb4ff;
-			height: 248px;
-			width: 248px;
-			border-radius: 50%;		
-			margin: 50px auto 20px;
-		}
-		.confirm-img-border3{
-			border: 2px solid #ffb8b8;
-			height: 248px;
-			width: 248px;
-			border-radius: 50%;		
-			margin: 50px auto 20px;
-			.confirm-img{
-				border-color:#ff6666;
-			}
-		}
-		h3{
-			text-align: center;
-			font-size: 18px;
-		}
-		p{
-			color:#999;text-align: center;
-			margin-top: 10rpx;
-		}
-	}	
-	.navbar-right {
-			display: flex;
-			margin-right: 20rpx;
-			span{
-				color:rgb(96, 98, 102);
-				margin-left: 3px;
-			}
-		}
-		.slot-wrap {
-				display: flex;
-				align-items: center;
-				flex: 1;
-			}
-	.confirm-pic{
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		padding: 20px;
-		margin-bottom: 30px;
-		.confirm-pic-item{
-			height:100px;
-			width: 100px;
-			border-radius: 50%;
-			overflow: hidden;
-			border: 3px solid #fff;
-			margin-bottom: 10px;
-			margin-right: 17px;
-			&:nth-child(3n+0){
-				margin-right: 0;
-			}
-			&.active{
-				border: 3px solid #1677ff;
-			}
-			img{
-				height: 100%;
-				width: 100%;
-			}
-		}
-	}
-	
-	.upload-button{
-		position: fixed;
-		left: 30rpx;
-		bottom:30rpx;
-		right: 30rpx;
-		display: flex;
-		.reset-btn{
-			height: 40px;
-			width: 40px;
-			border-radius: 50%;
-			text-align: center;
-			line-height: 40px;
-			border: 1px solid #eee;
-			margin-right: 10px;
-		}
-		.submit-btn{
-			flex: 1;
-			.gray-btn{
-				background-color: #bfbfbf;
-				color:#fff;
-				border-color: #bfbfbf;
-			}
-		}
-	}
-</style>

+ 0 - 22
pages/buytickets/edit.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

+ 0 - 344
pages/buytickets/home.js

@@ -1,344 +0,0 @@
-import * as WxJsApi from '@/utils/wxJsApi.js'
-import * as API from '@/apis/buytickets.js'
-import * as Pay from '@/apis/weixin.js'
-import {
-	wxPayJs
-} from '@/utils/wxpay'
-import Carmap from '@/components/Carmap.vue'
-
-export default {
-	data() {
-		return {
-
-			initBl: false,
-			title: '乘车人',
-			show: false,
-			id: 0, // 使用 marker点击事件 需要填写id
-
-			//地图居中后的位置
-			longitude: 112.276527,
-			latitude: 30.306427,
-			shiftInfo: {
-
-			},
-			list: [{}, {}],
-			//车的位置
-			car: {
-				obj: null,
-				longitude: '',
-				latitude: '',
-			},
-			stationList: [],
-			//个人
-			info: {
-				obj: null,
-				init: false,
-				longitude: '',
-				latitude: '',
-			},
-			myinterval: '',
-			downId: '',
-			downName: '',
-			passengerInfo: {
-				totalAmount: 0,
-				id: '',
-				list: []
-			}
-
-		}
-	},
-	components: {
-		Carmap
-	},
-
-	methods: {
-		gotoHome(){
-			uni.switchTab({
-			    url: '/pages/index/index'
-			});
-		},
-	
-		
-		select(op) {
-			//passengerInfo
-			var obj = this.carhelp.get("form");
-			if (this.passengerInfo.id) {
-				obj.mergeOrderId = this.passengerInfo.id;
-
-			}
-
-			if (op) {
-				obj.op = op;
-				this.carhelp.set("form", obj);
-
-				uni.navigateTo({
-					url: '/pages/buytickets/site?id=' + this.id 
-				})
-			} else {
-				obj.op = null;
-				this.carhelp.set("form", obj);
-				uni.navigateTo({
-					url: '/pages/buytickets/index?id=' + this.id+'&back=true'
-				})
-			}
-
-		},
-
-		submit() {
-			this.$refs.common.showLoading();
-			
-			console.log("Pay+"+new Date().getTime())
-			Pay.wxpay(this.passengerInfo.id).then((response) => {
-				if(!response.result){
-					this.$refs.common.showLoading(false, response.message);
-					return
-				}
-				var data = response.data
-				var url = window.location.href.split("#")[0] + "/#/pages/buytickets/success";
-				console.log("Pay+"+new Date().getTime())
-				
-				var obj = {
-					...data,
-					url: url
-				}
-				wxPayJs(obj);
-
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-
-			})
-		},
-		drawing(point, startend) {
-			if (this.$refs.amap) {
-				this.$refs.amap.initMap(point, this.stationList, startend);
-			}
-		},
-		getShiftInfoResponse(response, response2) {
-			this.$refs.common.showLoading();
-
-			var res = response.data
-			this.title = res.routeName;
-			this.shiftInfo = res;
-			this.car.latitude = res.latitude;
-			this.car.longitude = res.longitude;
-			var point = [];
-			res.mapPath.split("|").forEach((item) => {
-				var sz = item.split(",");
-
-				point.push({
-					longitude: sz[0],
-					latitude: sz[1],
-				})
-				if (!process.car.SIMPLE_RUN) {
-					this.longitude = sz[0]
-					this.latitude = sz[1]
-				}
-
-			})
-			var obj = this.carhelp.get("form")
-
-			obj.getShiftInfo = response;
-			obj.getVehicleStationInfo = response2;
-
-			var list = obj.getVehicleStationInfo.data;
-			for (var i in list) {
-				list[i].status = 0;
-			}
-			this.stationList = list
-			obj = this.carhelp.set("form", obj)
-
-			var sz1 = response.data.startStationCoordinate.split("|")
-			var sz2 = response.data.endStationCoordinate.split("|")
-			var startend = [{
-				longitude: sz1[0],
-				latitude: sz1[1],
-				name: response.data.startStation
-			}, {
-				longitude: sz2[0],
-				latitude: sz2[1],
-				name: response.data.endStation
-			}];
-
-			this.drawing(point, startend);
-			//this.$refs.common.showLoading(false);
-			this.getPoint()
-
-		},
-		getShiftInfo() {
-
-			this.$refs.common.showLoading();
-
-			var obj = this.carhelp.get("form")
-			if (false&&obj.getShiftInfo && obj.getVehicleStationInfo) {
-				this.stationList = obj.getVehicleStationInfo.data
-				this.getShiftInfoResponse(obj.getShiftInfo, obj.getVehicleStationInfo);
-				return;
-			}
-
-
-			API.getShiftInfo(this.id).then((response) => {
-				if (!response.result) {
-					this.$refs.common.goError(response.message)
-					return
-				}
-				API.getVehicleStationInfo(this.id).then((response2) => {
-					this.getShiftInfoResponse(response, response2);
-
-				})
-
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-
-			})
-		},
-		getPassengerInfo() {
-			
-			
-			var thisform = {
-				id: this.id,
-				openId: this.carhelp.getOpenId()
-			}
-			this.$refs.common.showLoading()
-
-			API.getPassengerInfo(thisform).then((response) => {
-				if (!response.result) {
-					this.$refs.common.goError(response.message)
-					return
-				}
-				if (response.data.supply) {
-					this.$refs.common.alert('存在需要补票的订单。')
-					
-					uni.switchTab({
-						url: '/pages/news/index'
-					});
-					return;
-				}
-				this.passengerInfo = response.data
-			
-				
-
-				var obj = this.carhelp.get("form");
-				if(!obj){
-					obj={}
-				}
-				obj.list = this.passengerInfo.list;
-				obj.name= 'buytickets';
-				obj.id= this.id;
-				this.carhelp.set("form", obj);
-				this.getShiftInfo()
-				 
-				
-			}).catch(error => {
-
-				if (error) {
-					this.$refs.common.goError(error)
-					return
-				}
-				//this.$refs.common.showLoading(false,error)
-			})
-		},
-		getPoint() {
-
-
-			if (!this.initBl) {
-				this.$refs.common.showLoading();
-			}
-			API.getVehicleInfo(this.id).then((response) => {
-				this.car = response.data;
-				this.$refs.amap.setCar(this.car);
-				var bl = false;
-				for (var i in this.stationList) {
-					var stat = this.stationList[i];
-					stat.status = 0
-					if (bl) {
-						stat.status = 2;
-					}
-					if (stat.id == this.car.currentStationId) {
-						stat.status = 1;
-						bl = true;
-					}
-				}
-				if (!this.initBl) {
-					this.initBl = true
-
-					this.$nextTick(function() {
-						const query = uni.createSelectorQuery().in(this);
-						query.select('.map-now').boundingClientRect(data => {
-							if (data) {
-								document.getElementById('map-route-main').scrollLeft = data
-								.left;
-							}
-							this.$refs.common.showLoading(false);
-						}).exec();
-					});
-				} else {
-					this.$refs.common.showLoading(false);
-				}
-
-
-
-
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-
-			})
-			if (!this.info.init) {
-				WxJsApi.getWxConfig(['getLocation']).then(() => {
-					// this.$refs.common.showLoading(false)
-					this.getLocation()
-				});
-			}else{
-					this.getLocation()
-			}
-		
-			
-
-			var pages = getCurrentPages();
-			var page = (pages[pages.length - 1]).route;
-			if (page == "pages/buytickets/home") {
-				setTimeout(this.getPoint, 10000);
-
-			}
-		},
-		getLocation(){
-			WxJsApi.getLocation().then((res) => {
-				console.log("----getLocation ok-----")
-				var latitude = parseFloat(res.latitude);
-				var longitude = parseFloat(res.longitude);
-			
-				if (!this.info.init) {
-					this.latitude = latitude;
-					this.longitude = longitude;
-				}
-				this.info.init = true
-				this.info.latitude = latitude;
-				this.info.longitude = longitude;
-			
-				this.$refs.amap.setPerson(this.info);
-			
-			}).catch(error => {
-				console.log(error)
-			})
-		}
-
-	},
-	onLoad(op) {
-
-		this.id = op.id
-	},
-	onUnload() {
-		if (this.myinterval) {
-			clearInterval(this.myinterval)
-		}
-	},
-	onReady() {
-		if (false&&!this.carhelp.getPersonInfo()) {
-			this.$refs.common.setFnc(this.confirmBtn)
-			this.$refs.common.alert2('您还不是车信达用户,注册后再购买车票。', '前往注册', '尚未注册')
-		} else{
-		}
-		this.getPassengerInfo()
-			 
-		
-	}
-}

+ 0 - 227
pages/buytickets/home.vue

@@ -1,227 +0,0 @@
-<template>
-	<view>
-		<car-common    ref="common"></car-common>
-			<u-navbar :title="title"  :is-back="false">
-				<view class="slot-wrap"></view>
-				<view class="navbar-right"  @click="gotoHome" >
-					<u-icon name="home-fill" color="#999" size="28"></u-icon>			
- 					<span >前往首页</span>
-				</view>
-			</u-navbar>
-		
-			<carmap ref="amap" :myStyle="'width: 100%; height: 140px;'"></carmap>
-
-			<view class="map-text">
-				<h4>{{shiftInfo.startStation}} → {{shiftInfo.endStation}}</h4>
-				<p>首班:{{shiftInfo.startTime}} 末班:{{shiftInfo.endTime}}</p>
-			</view>
-			<template  v-for="item in passengerInfo.list">
-				<view class="ticket-item" @click="select(item)">
-					<view class="ticket-item-left"  >
-						<view class="ticket-head">
-							<h3>{{item.ticketUpStationName}} - {{item.ticketDownStationName}}</h3>
-						</view>
-						<view class="ticket-text">
-							<view class="ticket-text-row">
-								<p>票种:</p><span>{{item.ticketTypeStr}}</span>
-							</view>
-							<view class="ticket-text-row">
-								<p>货票:</p><span>¥{{item.goodsTicket}}</span>
-							</view>
-						</view>
-					</view>
-					<view class="ticket-item-right">
-						<u-avatar size="default" :src="item.imageUrl"></u-avatar>
-						<h3>{{item.totalFee}}</h3>
-						
-					</view>
-				</view>
-			</template>
-			
-			 
-			<view class="add-btn">
-				<u-button type="primary" plain @click="select()">
-					<u-icon name="man-add-fill" color="#2979ff"  size="32"></u-icon>
-					添加乘车人
-				</u-button>
-			</view>
-			<view class="add-foot">
-				<view class="add-foot-price">
-					<p>合计:</p>
-					<span>¥{{passengerInfo.totalAmount}}</span>
-				</view>
-				<view class="add-foot-btn" @click="submit()" v-if="passengerInfo.list.length">
-					支付
-				</view>
-				<view class=" gray-btn" v-if="!passengerInfo.list.length">
-					支付
-				</view>
-			</view>
-	
-	</view>
-</template>
-
-<script>
-	import api from './home.js'
-	export default api;
-</script>
-
-<style>
-	page {
-		background-color: #f7f7f7;
-	}
-</style>
-<style scoped lang="scss">
-	.map-text {
-		background-color: #fff;
-		padding: 20rpx;
-
-		h4 {
-			font-size: 16px;
-		}
-
-		p {
-			margin-top: 10rpx;
-			color: #999;
-		}
-	}
-.navbar-right {
-		display: flex;
-		margin-right: 20rpx;
-		span{
-			color:rgb(96, 98, 102);
-			margin-left: 3px;
-		}
-	}
-	.ticket-item {
-		background-color: #fff;
-		margin: 20rpx;
-		border-radius: 10px;
-		display: flex;
-		justify-content: space-between;
-
-		.ticket-item-left {
-			padding: 30rpx;
-
-			.ticket-head {
-				display: flex;
-				align-items: center;
-			}
-
-			.ticket-text {
-				margin-top: 20rpx;
-
-				.ticket-text-row {
-					display: flex;
-					align-items: center;
-					margin-bottom: 10rpx;
-
-					&:last-child {
-						margin-bottom: 0;
-					}
-
-					span {
-						color: #007AFF
-					}
-				}
-			}
-		}
-
-		.ticket-item-right {
-			width: 120px;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			border-left: 1px dashed #eee;
-			position: relative;
-			padding: 20rpx;
-
-			&:before {
-				content: '';
-				position: absolute;
-				height: 30rpx;
-				width: 30rpx;
-				background-color: #f7f7f7;
-				border-radius: 50%;
-				left: -15rpx;
-				top: -15rpx;
-			}
-
-			&:after {
-				content: '';
-				position: absolute;
-				height: 30rpx;
-				width: 30rpx;
-				background-color: #f7f7f7;
-				border-radius: 50%;
-				left: -15rpx;
-				bottom: -15rpx;
-			}
-
-			h3 {
-				color: #007AFF;
-				font-size: 24px;
-			}
-		}
-
-	}
-
-	.add-btn {
-		margin: 20rpx;
-		padding-bottom: 60px;
-
-		.u-icon {
-			margin-right: 10rpx;
-		}
-	}
-.slot-wrap {
-		display: flex;
-		align-items: center;
-		flex: 1;
-	}
-	.add-foot {
-		position: fixed;
-		background-color: #fff;
-		z-index: 99;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		height: 90rpx;
-		display: flex;
-		justify-content: space-between;
-
-		.add-foot-price {
-			display: flex;
-			align-items: center;
-			padding-left: 20rpx;
-			font-size: 32rpx;
-			font-weight: bold;
-
-			span {
-				color: #ff6200;
-			}
-		}
-
-		.add-foot-btn {
-			width: 240rpx;
-			background-color: #ff6200;
-			color: #fff;
-			font-size: 32rpx;
-			text-align: center;
-			line-height: 90rpx;
-			
-		}
-		.gray-btn {
-			width: 240rpx;
-			background-color: #bfbfbf;
-			color:#fff;
-			border-color: #bfbfbf;
-		
-			font-size: 32rpx;
-			text-align: center;
-			line-height: 90rpx;
-			
-		}
-	}
-</style>

+ 0 - 219
pages/buytickets/index.js

@@ -1,219 +0,0 @@
-import * as API from '@/apis/buytickets.js'
-
-
-export default {
-	data() {
-		return {
-			isLoading:true,
-			initBl:false,
-			noback:false,
-			passengerInfo:{},
-			id: '',
-			num: 0,
-			pic: '',
-			list: [],
-			selectList: [],
-			subForm: {
-				pageIndex: 1,
-				pageSize: 20,
-				totalPage: 1
-			}
-		}
-	},
-	methods: {
-		gotoHome(){
-			uni.switchTab({
-			    url: '/pages/index/index'
-			});
-		},
-		
-		submit() {
-			var obj = this.carhelp.get("form");
-			obj.oplist = []
-			for (var i in this.list) {
-				if (this.list[i].ck) {
-					obj.oplist.push(this.list[i]);
-				}
-			}
-			this.carhelp.set("form", obj);
-
-			uni.navigateTo({
-				url: '/pages/buytickets/selectSite?select=true&id=' + this.id
-			})
-		},
-		ckBtn(item) {
-			if(this.num==5&&!item.ck){
-				this.$refs.common.alert("一次最多选择5名乘车人员");
-				return
-			}
-			item.ck = !item.ck;
-
-			if (item.ck) {
-				var bl=true
-				for (var i = 0; i < this.selectList.length; i++) {
-					if (this.selectList[i].upStationId != item.upStationId) {
-						bl=false;
-					
-					}
-					break;
-				}
-				if(!bl){
-					item.ck = !item.ck;
-					this.$refs.common.alert("所选乘客上车站点不一致,请重新选择。");
-					return;
-				}
-				this.num++;
-				this.selectList.push(item);
-			} else {
-				this.num--;
-				for (var i = 0; i < this.selectList.length; i++) {
-					if (this.selectList[i].id == item.id) {
-						this.selectList.splice(i, 1);
-					}
-				}
-			}
-			console.log(this.selectList)
-		},
-		getPassengerInfo() {
-			
-			
-			var thisform = {
-				id: this.id,
-				openId: this.carhelp.getOpenId()
-			}
-			this.$refs.common.showLoading()
-		
-			API.getPassengerInfo(thisform).then((response) => {
-				if (!response.result) {
-					this.$refs.common.goError(response.message)
-					return
-				}
-				this.passengerInfo = response.data
-				
-				var obj = this.carhelp.get("form");
-				if(!obj){
-					obj={}
-				}
-				
-				//obj.list = this.passengerInfo.list;
-				obj.name= 'buytickets';
-				obj.id= this.id;
-				this.carhelp.set("form", obj);
-				
-				if (response.data.supply) {
-					this.$refs.common.alert('存在需要补票的订单。')
-					
-					uni.switchTab({
-						url: '/pages/news/index'
-					});
-					return;
-					//this.$refs.common.goError(response.message)
-					this.$refs.common.setFnc(()=>{
-						uni.switchTab({
-							url: '/pages/news/index'
-						});
-					},()=>{
-						if (!response.data.id) {
-							uni.redirectTo({
-								url: '/pages/buytickets/index?id=' + this.id+'&back=true'
-							})
-						} else {
-							
-							this.getShiftInfo()
-						}
-					})
-					this.$refs.common.confirm('存在需要补票的订单,是否前去查看?')
-				return;
-				}
-				
-				this.upBusNoTicketList(true);
-				
-			}).catch(error => {
-		
-				if (error) {
-					this.$refs.common.goError(error)
-					return
-				}
-				//this.$refs.common.showLoading(false,error)
-			})
-		},
-		upBusNoTicketList(bl) {
-			this.num=0
-			this.$refs.common.showLoading();
-			this.subForm.id = this.id;
-			var obj = this.carhelp.get("form")
-			//this.list = [];
-			//this.isLoading=true;
-			API.upBusNoTicketList(this.subForm).then((res) => {
-				this.isLoading=false;
-				this.list = res.data.data;
-				//this.list = [];
-				if(!this.list.length){
-					this.$refs.common.showLoading(false);
-					if(!bl){
-						this.$refs.common.alert("刷新成功");	
-					}
-					return;
-				}
-				
-		 
-				this.selectList=[];//清空选中
-				if (this.list.length != 0&&!bl) {
-					this.$refs.common.showLoading(false, "刷新成功");
-				} else {
-					this.$refs.common.showLoading(false);
-				}
-
-				
-
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-
-			})
-		}
-	},
-	onLoad(op) {
-		if(op.back){
-			this.noback=op.back
-		}
-		this.id = op.id
-	},
-	onReady() {
-
-		if (!this.id) {
-			this.$refs.common.goError()
-		}
-		var obj = this.carhelp.get("form")
-
-		if (obj && obj.name == 'buytickets' && obj.id == this.id) {
-			//不创建新订单
-			obj.buy=null;
-			this.carhelp.set("form",obj);
-		} else {
-			this.carhelp.set("form", {
-				name: 'buytickets',
-				id: this.id,
-				oplist: [], //当前添加的2人
-				list: [] // 一共添加的人 
-			});
-		}
-
-		if (false&&!this.carhelp.getPersonInfo()) {
-			this.$refs.common.setFnc(this.confirmBtn)
-			this.$refs.common.alert2('您还不是车信达用户,注册后再购买车票。', '前往注册', '尚未注册')
-		} else {
-		}
-		if (this.noback) {
-			 this.upBusNoTicketList(true);
-		} else {
-			this.getPassengerInfo()
-		}
-			//this.upBusNoTicketList();
-		this.initBl=true;
-
-	},onShow(){
-		if(this.initBl){
-			 this.upBusNoTicketList(true);
-		}	
-	}
-}

+ 0 - 183
pages/buytickets/index.vue

@@ -1,183 +0,0 @@
-<template>
-	<view>
-		<car-common   ref="common"></car-common>
-		<car-loading  v-if="isLoading"  ></car-loading>
-		
-		<u-navbar title="确认身份"  :is-back="noback">
-			<view class="slot-wrap"></view>
-			<view class="navbar-right"  @click="gotoHome" v-if="!noback" >
-				<u-icon name="home-fill" color="#999" size="28"></u-icon>
-				<span >前往首页</span>
-			</view>
-		</u-navbar>
-		<view class="confirm" v-show="!list.length">
-		
-			<view class="confirm-img-border3" v-if="!isLoading" >
-				<view class="confirm-img-border">
-					<view class="confirm-img">
-						<img src="static/img/discern.png" alt="">
-					</view>
-				</view>
-			</view>
-			<h3>欢迎乘坐{{passengerInfo.routeName}}车<br>请前往上车处刷脸登记</h3>
-		</view>
-		<view class="confirm" v-show="list.length">
-		
-			<h3 >请选择购票人的照片?</h3>
-			<p v-show="!num">一位乘客仅需选择一张照片</p>
-			<p v-show="num">如需为您的同伴购票请同时选中Ta的照片</p>
-			
-			<view class="confirm-pic" v-if="list.length">
-				<template v-for="item in list">
-					<view class="confirm-pic-item "   :class="item.ck?'active':''" @click="ckBtn(item)" >
-						<img :src="item.imageUrl" alt="">	
-					</view>
-				</template>	 
-				 
-			</view>
-			<p v-show="!num"><span style="color: #007AFF;">若无本人照片?</span>请前往上车处重新刷脸登记</p>
-			
-		</view>
-		 
-		<view class="upload-button" >
-			<view class="reset-btn" @click="upBusNoTicketList(false)">
-				<u-icon name="shuaxin" custom-prefix="custom-icon" color="#2979ff" size="36"></u-icon>
-			</view>
-			
-			<view class="submit-btn" v-show="num">
-				<u-button type="primary" shape="circle" @click="submit">确定</u-button>
-			</view>
-			
-			<view class="submit-btn" v-show="!num">
-				<u-button class="gray-btn" type="default" shape="circle" >请选择</u-button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from './index.js'
-	export default api;
-</script>
-
-<style scoped lang="scss">
-	.confirm-img-border3{
-		border: 2px solid #ffb8b8;
-		height: 248px;
-		width: 248px;
-		border-radius: 50%;		
-		margin: 50px auto 20px;
-		.confirm-img{
-			border-color:#ff6666;
-		}
-	}
-	.confirm{
-		margin-top: 20px;
-		.confirm-img{
-			height: 240px;
-			width: 240px;
-			border-radius: 50%;
-			overflow: hidden;
-			border:4px solid #1677ff;
-			img{
-				height: 100%;
-				width: 100%;
-			}
-		}
-		.confirm-img-border{
-			border: 2px solid #fff;
-			height: 244px;
-			width: 244px;
-			border-radius: 50%;
-		}
-		.confirm-img-border2{
-			border: 2px solid #7fb4ff;
-			height: 248px;
-			width: 248px;
-			border-radius: 50%;		
-			margin: 50px auto 20px;
-		}
-		.confirm-img-border3{
-			border: 2px solid #ffb8b8;
-			height: 248px;
-			width: 248px;
-			border-radius: 50%;		
-			margin: 50px auto 20px;
-			.confirm-img{
-				border-color:#ff6666;
-			}
-		}
-		h3{
-			text-align: center;
-			font-size: 18px;
-		}
-		p{
-			color:#999;text-align: center;
-			margin-top: 10rpx;
-		}
-	}	
-	.navbar-right {
-			display: flex;
-			margin-right: 20rpx;
-			span{
-				color:rgb(96, 98, 102);
-				margin-left: 3px;
-			}
-		}
-		.slot-wrap {
-				display: flex;
-				align-items: center;
-				flex: 1;
-			}
-	.confirm-pic{
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		padding: 20px;
-		margin-bottom: 30px;
-		.confirm-pic-item{
-			height:100px;
-			width: 100px;
-			border-radius: 50%;
-			overflow: hidden;
-			border: 3px solid #fff;
-			margin-bottom: 10px;
-			margin-right: 5%;
-			&:nth-child(3n+0){
-				margin-right: 0;
-			}
-			&.active{
-				border: 3px solid #1677ff;
-			}
-			img{
-				height: 100%;
-				width: 100%;
-			}
-		}
-	}
-	
-	.upload-button{
-		position: fixed;
-		left: 30rpx;
-		bottom:30rpx;
-		right: 30rpx;
-		display: flex;
-		.reset-btn{
-			height: 40px;
-			width: 40px;
-			border-radius: 50%;
-			text-align: center;
-			line-height: 40px;
-			border: 1px solid #eee;
-			margin-right: 10px;
-		}
-		.submit-btn{
-			flex: 1;
-			.gray-btn{
-				background-color: #bfbfbf;
-				color:#fff;
-				border-color: #bfbfbf;
-			}
-		}
-	}
-</style>

+ 0 - 410
pages/buytickets/selectSite.js

@@ -1,410 +0,0 @@
-import * as WxJsApi from '@/utils/wxJsApi.js'
-import * as API from '@/apis/buytickets.js'
-
-import Carmap from '@/components/Carmap.vue'
-
-export default {
-	data() {
-		return {
-			caritemBl:false,
-			show1: false,
-			show2: false,
-			buy:"",
-			look:false,
-			initBl: false,
-			title: '乘车人',
-			show: false,
-			id: 0, // 使用 marker点击事件 需要填写id
-			k:0,
-			//地图居中后的位置
-			longitude: 112.276527,
-			latitude: 30.306427,
-			upid:'',
-			shiftInfo: {
-
-			},
-			mapopen:false,
-			list: [{}, {}],
-			//车的位置
-			car: {
-				obj: null,
-				longitude: '',
-				latitude: '',
-			},
-			stationList: [],
-			//个人
-			info: {
-				obj: null,
-				init: false,
-				longitude: '',
-				latitude: '',
-			},
-			showInfo:{
-				driver:{}
-			},
-			myinterval: '',
-			downId: '',
-			downName: '',
-			passengerInfo:{
-				totalAmount:0,
-				id:'',
-				list:[]
-			}
-			
-		}
-	},
-	components: {
-		Carmap
-	},
-
-	methods: {
-		makePhoneCall(tel){
-			uni.makePhoneCall({
-			    phoneNumber: tel //仅为示例
-			});
-		},
-		mapopenBtn(){
-			this.mapopen=!this.mapopen;
-			if(this.mapopen){
-				this.$refs.amap.setMyStyle("width: 100%; height: 340px;")
-			}else{
-				this.$refs.amap.setMyStyle("width: 100%; height: 140px;")
-				
-			}
-		},
-		downBtn(item) {
-			
-			if (!this.look&&item.id==this.car.currentStationId&&this.upid!=item.id) {
-				this.downId = item.id
-				this.downName = item.stationName
-				this.$refs.amap.setDown(item);
-			}
-			if (!this.look&&item.status != 0) {
-				this.downId = item.id
-				this.downName = item.stationName
-				this.$refs.amap.setDown(item);
-			}
-				this.$refs.amap.setCenter(item);
-
-		},
-		
-	
-		selectSiteBtn(){
-			 
-			var obj=this.carhelp.get("form");
-			var upid='';
-			
-		
-			upid=obj.oplist[0].upStationId;
-			
-			var downid=this.downId;
-			
-			this.$refs.common.showLoading();
-			
-			var thisform={
-				ticketUpStationId:upid,
-				ticketDownStationId:downid	,	
-				ticketDownStationName:this.downName,
-				price1:0,
-				price2:0
-			}
-			thisform.ticketType=1;
-			 
-			API.ticketAmount(thisform).then((response) => {
-				thisform.price1=response.data.price
-				thisform.ticketType=2;
-				API.ticketAmount(thisform).then((response2) => {
-					thisform.price2=response2.data.price
-					obj.ticket=thisform;
-					if(obj.op){
-						 obj.op.ticketDownStationId=this.downId;
-						obj.op.ticketDownStationName=this.downName;
-					}
-					
-					this.carhelp.set("form",obj);
-					//uni.navigateBack()
-					uni.redirectTo({
-						url: '/pages/buytickets/site?id='+this.id
-					})
-				})
-				
-			
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-			
-			})
-			
-		},
-	
-		drawing(point, startend) {
-			if(this.$refs.amap){
-				this.$refs.amap.initMap(point, this.stationList, startend);
-			}
-		},
-		getShiftInfoResponse(response, response2) {
-			this.$refs.common.showLoading();
-
-			var res = response.data
-			this.title = res.routeName;
-			this.shiftInfo = res;
-			this.car.latitude = res.latitude;
-			this.car.longitude = res.longitude;
-			var point = [];
-			res.mapPath.split("|").forEach((item) => {
-				var sz = item.split(",");
-
-				point.push({
-					longitude: sz[0],
-					latitude: sz[1],
-				})
-				if (!process.car.SIMPLE_RUN) {
-					this.longitude = sz[0]
-					this.latitude = sz[1]
-				}
-
-			})
-			var obj = this.carhelp.get("form")
-
-			obj.getShiftInfo = response;
-			obj.getVehicleStationInfo = response2;
-
-			var list = obj.getVehicleStationInfo.data;
-			for (var i in list) {
-				list[i].status = 0;
-			}
-			this.stationList = list
-			obj = this.carhelp.set("form", obj)
-
-			var sz1 = response.data.startStationCoordinate.split("|")
-			var sz2 = response.data.endStationCoordinate.split("|")
-			var startend = [{
-				longitude: sz1[0],
-				latitude: sz1[1],
-				name: response.data.startStation
-			}, {
-				longitude: sz2[0],
-				latitude: sz2[1],
-				name: response.data.endStation
-			}];
-
-			this.drawing(point, startend);
-			//this.$refs.common.showLoading(false);
-			this.getPoint()
-		
-
-		},
-		showname(name){
-			if(!name){
-				return "";
-			}
-		
-			return name.substring(0,1)+'师傅';
-		},
-		carShow(){
-			this.caritemBl=true;
-		},
-		getShiftInfo() {
-			 
-			this.$refs.common.showLoading();
-			
-			var obj = this.carhelp.get("form")
-			if (false&&obj.getShiftInfo && obj.getVehicleStationInfo) {
-				this.stationList = obj.getVehicleStationInfo.data
-				this.getShiftInfoResponse(obj.getShiftInfo, obj.getVehicleStationInfo);
-				return;
-			}
-
-
-			API.getShiftInfo(this.id).then((response) => {
-				if (!response.result) {
-					this.$refs.common.goError(response.message)
-					return
-				}
-				this.showInfo={
-					driver:response.data.driver,
-					licensePlateNumber:response.data.licensePlateNumber
-				}
-				
-				API.getVehicleStationInfo(this.id).then((response2) => {
-					
-					this.getShiftInfoResponse(response, response2);
-
-				})
-
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-
-			})
-		},
-		carShow2(item){
-			console.log(item)
-			if(item.type=="car"){
-				setTimeout(()=>{
-					this.carShow()
-				}, 100);
-			}
-			if(item.type=="point"){
-				
-				setTimeout(()=>{
-					this.downBtn(item.obj)
-					document.getElementById('map-route-main').scrollLeft = 0
-					
-					this.$nextTick(function() {
-						const query = uni.createSelectorQuery().in(this);
-						query.select('.map-down').boundingClientRect(data => {
-							if(data){
-								document.getElementById('map-route-main').scrollLeft = data.left-100;
-							}
-							this.$refs.common.showLoading(false);
-							//this.downBtn()
-						}).exec();
-					});
-				}, 100);
-			}
-			
-		},
-		getPoint() {
-			if (!this.initBl) {
-				this.$refs.common.showLoading();
-			}
-			//this.k=0
-			API.getVehicleInfo(this.id).then((response) => {
-				this.car = response.data;
-				
-				//this.car.currentStationId=this.stationList[this.k].id
-				//this.car.currentStationStatus="2"
-				//this.car.currentStationId=this.stationList[2].id
-				//this.car.currentStationStatus="2";
-				
-				this.$refs.amap.setCar(this.car);
-				var bl = false;
-				var bl2 = false;
-				for (var i in this.stationList) {
-					var stat = this.stationList[i];
-					stat.status = 0
-					if (bl2) {
-						stat.status = 2;	
-					}
-					if (bl) {
-						stat.status = 1;
-						bl = false;
-						bl2 = true;
-					}
-					
-					if (stat.id == this.car.currentStationId) {
-						if(this.car.currentStationStatus=="3"){
-							if(eval(i+"+"+1)!=this.stationList.length){
-								this.car.currentStationId2=this.stationList[eval(i+"+"+1)].id;
-								
-							}
-						}
-						bl = true;
-						if(i==this.stationList.length-1){
-								stat.status = 1;
-						}
-						if(this.buy){
-							this.downBtn(stat)
-						}
-					}
-				}
-				if (!this.initBl) {
-					this.initBl = true
-					
-					this.$nextTick(function() {
-						const query = uni.createSelectorQuery().in(this);
-						query.select('#map-now').boundingClientRect(data => {
-							if(data){
-								document.getElementById('map-route-main').scrollLeft = data.left-100;
-							}
-							this.$refs.common.showLoading(false);
-						}).exec();
-					});
-				}else{
-					this.$refs.common.showLoading(false);
-				}
-
-
-
-
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-
-			})
-			WxJsApi.getLocation().then((res) => {
-
-				var latitude = parseFloat(res.latitude);
-				var longitude = parseFloat(res.longitude);
-
-				if (!this.info.init) {
-					this.latitude = latitude;
-					this.longitude = longitude;
-				}
-				this.info.init = true
-				this.info.latitude = latitude;
-				this.info.longitude = longitude;
-
-				this.$refs.amap.setPerson(this.info);
-
-			}).catch(error => {
-
-			})
-			
-			var pages = getCurrentPages();
-			var page = (pages[pages.length - 1]).route;  
-			if(page=="pages/buytickets/selectSite"){
-				setTimeout(this.getPoint, 10000);
-				
-			}
-		},
-
-
-	},
-	onLoad(op) {
-		if(op.select){
-			this.look=false;
-		}else{
-			this.look=true;// 只读界面
-		}
-		this.id = op.id
-		var obj=this.carhelp.get("form");
-		if(obj.oplist&&obj.oplist.length){
-			this.upid=obj.oplist[0].upStationId;	
-		}
-		
-	},
-	onUnload() {
-		if (this.myinterval) {
-			clearInterval(this.myinterval)
-		}
-	},onShow(){
-		console.log("onShowonShowonShowonShow")
-		this.$nextTick(function() {
-			try{
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#map-now').boundingClientRect(data => {
-					if(data){
-						document.getElementById('map-route-main').scrollLeft = data.left-100;
-					}
-					this.$refs.common.showLoading(false);
-				}).exec();
-			}catch(err){
-				console.log("err")
-				
-			}
-			
-		});
-	},
-	onReady() {
-			this.$refs.common.showLoading()
-			 WxJsApi.getWxConfig(['getLocation']).then(()=>{
-				 this.$refs.common.showLoading(false)
-			 });
-			 var obj = this.carhelp.get("form");
-			 this.buy=obj.buy;
-			 
-		this.getShiftInfo()
-		var pages = getCurrentPages();  
-		var page = (pages[pages.length - 1]).route;  
-		
-	}
-}

+ 0 - 471
pages/buytickets/selectSite.vue

@@ -1,471 +0,0 @@
-<template>
-	<view>
-		<car-common     ref="common"></car-common>
-		
-		
-		<u-popup v-model="caritemBl"  mode="center" closeable="true" border-radius="20">
-			<view class="sitePopup">
-				<view class="sitePopup-head">
-				
-					<h1>{{shiftInfo.startStation}} → {{shiftInfo.endStation}}</h1>
-					<p>首班:{{shiftInfo.startTime}} 末班:{{shiftInfo.endTime}}</p>
-				</view>
-				<view class="sitePopup-main">
-					<view class="sitePopup-driver">				
-						<view class="driver-info">
-							<view class="driver-head">
-								<u-avatar :src="showInfo.driver.faceImage" size="100"></u-avatar>
-							</view>
-							<view class="driver-text">
-								<h2>{{showInfo.licensePlateNumber}}</h2>
-								<p>{{showname(showInfo.driver.name)}}  {{showInfo.driver.phone}}</p>
-							</view>
-						</view>
-						<u-icon name="dianhua" v-if="showInfo.driver.phone"  @click="makePhoneCall(showInfo.driver.phone)"  custom-prefix="custom-icon" size="80" color="#1778fb"></u-icon>
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		
-		<u-navbar :title="title"   :is-back="!look" >
-			<view class="slot-wrap"></view>
-			<view class="navbar-right" @click="mapopenBtn"  >
-				<u-icon name="plus-circle" v-if="!mapopen" color="#999" size="28"></u-icon>
-				<span v-if="!mapopen">放大地图</span>
-				<u-icon name="minus-circle" v-if="mapopen" color="#999" size="28"></u-icon>
-				<span v-if="mapopen">缩小地图</span>
-			</view>
-		</u-navbar>
-		
-		<carmap ref="amap"   @clickMap="carShow2"  ></carmap>
-
-		<view class="map-info">
-			<view class="map-text">
-				<h4>{{shiftInfo.startStation}} → {{shiftInfo.endStation}}</h4>
-				<p>首班:{{shiftInfo.startTime}} 末班:{{shiftInfo.endTime}}</p>
-			</view>
-			<!-- <view class="map-btn">
-				<u-icon name="swap" custom-prefix="custom-icon"  color="#2979ff"></u-icon>
-				<span>换向</span>
-			</view> -->
-		</view>
-	
-		
-		<view class="map-route">
-			<view class="map-route-head" >
-				&lt;&lt;&lt; 下方列表可以左右滑动 &gt;&gt;&gt;
-			</view>
-		 <view class="map-route-main"  id="map-route-main">
-			<template v-for="item,i in stationList">
-				<view :id="item.status==1?'map-now':''" class="scroll-view-item "
-				 :class="{'map-route-origin':i==0,'map-route-item':i!=0,'map-after':item.status==0&&!(item.id == car.currentStationId&&car.currentStationStatus=='2'),
-				 'map-after ':(item.id == car.currentStationId&&car.currentStationStatus=='1'),
-					'map-now':(item.id == car.currentStationId2&&car.currentStationStatus=='3')||(item.id == car.currentStationId&&car.currentStationStatus=='2'),
-					'map-geton':upid==item.id||downId==item.id||(item.id == car.currentStationId&&i==0)}">
-					
-					<view class="map-route-car"  @click="carShow()"   v-show="item.id == car.currentStationId&&(car.currentStationStatus=='1'||car.currentStationStatus=='2')">
-						<img src="static/img/car.png" alt="">
-					</view>
-					 
-					<view class="map-route-car"   @click="carShow()"  v-show="item.id == car.currentStationId2&&car.currentStationStatus=='3'">
-						<img src="static/img/car.png" alt="">
-					</view>
-					
-					<view class="map-route-circle"  @click="downBtn(item)">{{upid==item.id?'上':''}}{{downId==item.id?'下':''}}</view>
-					<view class="map-route-line"  @click="downBtn(item)"></view>
-					<view class="map-route-name"  @click="downBtn(item)">
-						{{item.stationName}}  
-					</view>
-				</view>
-
-			</template>
-		</view>	
-
-			<view class="map-route-main"  v-if="false" >
-				<!-- <view class="map-route-origin">
-					<view class="map-route-circle"></view>
-					<view class="map-route-name">
-						1锣场
-					</view>
-				</view> -->
-				<view class="map-route-origin map-geton">
-					<view class="map-route-car">
-						<img src="static/img/car.png" alt="">
-					</view>
-					<view class="map-route-circle">上</view>
-					<view class="map-route-name">
-						1锣场
-					</view>
-				</view>
-				<view class="map-route-item map-after">
-					<view class="map-route-circle"></view>
-					<view class="map-route-line"></view>
-					<view class="map-route-name">
-						2东方大道
-					</view>
-				</view>
-				<view class="map-route-item map-now">
-					<view class="map-route-car">
-						<img src="static/img/car.png" alt="">
-					</view>
-					<view class="map-route-circle"></view>
-					<view class="map-route-line"></view>
-					<view class="map-route-name">
-						3小天鹅
-					</view>
-				</view>
-				<view class="map-route-item map-color">
-					<view class="map-route-circle"></view>
-					<view class="map-route-line"></view>
-					<view class="map-route-name">
-						4宿架转盘转盘
-					</view>
-				</view>
-				<view class="map-route-item">
-					<view class="map-route-car">
-						<img src="static/img/car.png" alt="">
-					</view>
-					<view class="map-route-circle"></view>
-					<view class="map-route-line"></view>
-					<view class="map-route-name">
-						5荆棉
-					</view>
-				</view>
-				<view class="map-route-item map-geton">
-					<view class="map-route-car">
-						<img src="static/img/car.png" alt="">
-					</view>
-					<view class="map-route-circle">下</view>
-					<view class="map-route-line"></view>
-					<view class="map-route-name">
-						6跃进村
-					</view>
-				</view>
-				<view class="map-route-item">
-					<view class="map-route-circle"></view>
-					<view class="map-route-line"></view>
-					<view class="map-route-name">
-						7变电站
-					</view>
-				</view>
-				<view class="map-route-item">
-					<view class="map-route-circle"></view>
-					<view class="map-route-line"></view>
-					<view class="map-route-name">
-						8跃进村
-					</view>
-				</view>
-				<view class="map-route-item">
-					<view class="map-route-circle"></view>
-					<view class="map-route-line"></view>
-					<view class="map-route-name">
-						9变电站
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="add-foot" v-if="!look">
-			<view class="add-foot-price">
-				<p>下站站点:{{downName?downName:'点击选择站点'}}</p>
-			</view>
-			<view class="add-foot-btn" v-show="downName" @click="selectSiteBtn()">
-				确认
-			</view>
-			<view class="add-foot-btn" style="background-color: #969896;" v-show="!downName">
-				确认
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from './selectSite.js'
-	export default api;
-</script>
-<style scoped lang="scss">
-	
-	.map-route {
-			border-top: 10px solid #f7f7f7;
-			background-color: #fff;
-			padding-bottom: 60px;
-		
-			.map-route-head {
-				font-size: 16px;
-				color: #007AFF;
-				text-align: center;
-				line-height: 20px;
-				border-bottom: 1px solid #eee;
-			}
-		
-			.map-route-main {
-				padding: 10px;
-				position: relative;
-				overflow-x: scroll !important;
-				display: -webkit-box;
-			}
-		}
-	
-		.map-info {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			background-color: #fff;
-			padding: 20rpx;
-		}
-	
-		.map-text {
-			h4 {
-				font-size: 16px;
-			}
-	
-			p {
-				margin-top: 10rpx;
-				color: #999;
-			}
-		}
-	
-		.map-btn {
-			border: 1px solid #007AFF;
-			color: #007AFF;
-			padding: 5px 15px;
-			border-radius: 30px;
-	
-			span {
-				margin-left: 6rpx;
-			}
-		}
-	
-		.map-route-origin {
-			position: relative;
-			height: 200px;
-			width: 15px;
-			.map-route-circle {
-				position: absolute;
-				left: 0;
-				top: 30px;
-				height: 15px;
-				width: 15px;
-				border-radius: 50%;
-				background-color: #999;
-				border: 3px solid #fff;
-				box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
-				z-index: 99;
-			}
-			.map-route-name {
-				position: absolute;
-				top: 50px;
-				width: 16px;
-				line-height: 16px;
-				z-index: 999;
-				left: 3px;
-			}
-			&.map-geton{
-				.map-route-circle {
-					width: 24px;
-					background-color: #fff;
-					height: 24px;
-					border: 3px solid #25ad3b;
-					color:#25ad3b;
-					text-align: center;
-					line-height: 18px;
-					font-size:10px;
-					top:25px;
-					left: -3px;
-				}
-				.map-route-car {
-					height: 30px;
-					width: 30px;
-					position: absolute;
-					right: -10px;
-					top: 2px;
-				
-					img {
-						height: 100%;
-						width: 100%;
-					}
-				}
-			}
-		}
-	
-		.map-route-item {
-			position: relative;
-			height: 200px;
-			width: 60px;
-			.map-route-car {
-				height: 30px;
-				width: 30px;
-				position: absolute;
-				right: -10px;
-				top: 2px;
-			
-				img {
-					height: 100%;
-					width: 100%;
-				}
-			}
-			.map-route-circle {
-				position: absolute;
-				right: -2px;
-				top: 30px;
-				height: 15px;
-				width: 15px;
-				border-radius: 50%;
-				background-color: #fff;
-				border: 3px solid #1677ff;
-				z-index: 99;
-			}
-	
-			.map-route-line {
-				height: 6px;
-				background-color: #1677ff;
-				width: 55px;
-				position: absolute;
-				left: 0px;
-				top: 35px;
-				z-index: 9;
-			}
-	
-			.map-route-name {
-				position: absolute;
-				top: 50px;
-				width: 16px;
-				line-height: 16px;
-				z-index: 999;
-				right: -3px;
-				text-align: center;
-			}
-		}
-	
-		.map-route-item.map-now {
-			.map-route-car {
-				height: 30px;
-				width: 30px;
-				position: absolute;
-				left: 10px;
-				top: 2px;
-	
-				img {
-					height: 100%;
-					width: 100%;
-				}
-			}
-	
-			.map-route-circle {
-				border: 3px solid #ff6200;
-			}
-	
-			.map-route-line {
-				background-color: #ff6200;
-			}
-		}
-	
-		.map-route-item.map-after {
-			.map-route-circle {
-				border: 3px solid #999;
-			}
-	
-			.map-route-line {
-				background-color: #999;
-			}
-		}
-	
-		.map-route-item.map-geton {
-			.map-geton-mark {
-				width:20px;
-				height: 20px;
-				right: 0;
-				position: absolute;
-				right: -4px;
-				top: 5px;
-				img {
-					height: 100%;
-					width: 100%;
-				}
-			}
-	
-			.map-route-circle {
-				width: 24px;
-				height: 24px;
-				border: 3px solid #25ad3b;
-				color:#25ad3b;
-				text-align: center;
-				line-height: 18px;
-				font-size:10px;
-				top:25px;
-				right: -8px;
-			}
-	
-			.map-route-name {
-				color: #25ad3b
-			}
-		}
-	.map-route-item.map-geton1 {
-			.map-geton-mark {
-				width: 20px;
-				height: 20px;
-				right: 0;
-				position: absolute;
-				right: -4px;
-				top: 5px;
-	
-				img {
-					height: 100%;
-					width: 100%;
-				}
-			}
-	
-			.map-route-circle {
-				border: 3px solid #25ad3b;
-			}
-	
-			.map-route-name {
-				color: #25ad3b
-			}
-		}
-		.add-foot { 
-			position: fixed;
-			background-color: #fff;
-			border-top: 1px solid #eee;
-			z-index: 999;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			height: 90rpx;
-			display: flex;
-			justify-content: space-between;
-	
-			.add-foot-price {
-				display: flex;
-				align-items: center;
-				padding-left: 20rpx;
-				font-size: 32rpx;
-	
-				span {
-					color: #1677ff;
-				}
-			}
-	
-			.add-foot-btn {
-				width: 240rpx;
-				background-color: #1677ff;
-				color: #fff;
-				font-size: 32rpx;
-				text-align: center;
-				line-height: 90rpx;
-			}
-		}
-		.navbar-right {
-				display: flex;
-				margin-right: 20rpx;
-				span{
-					color:rgb(96, 98, 102);
-					margin-left: 3px;
-				}
-			}
-			.slot-wrap {
-					display: flex;
-					align-items: center;
-					flex: 1;
-				}
-</style>
-

+ 0 - 230
pages/buytickets/site.js

@@ -1,230 +0,0 @@
-import * as API from '@/apis/buytickets.js'
-import * as Pay from '@/apis/weixin.js'
-import {
-	wxPayJs
-} from '@/utils/wxpay'
- export default {
- 	data() {
- 		return {
- 			total:0,
- 			uid: '', //用户id ,有id是修改
- 			id: '', //车id
- 			type: 2,
- 			pnum: 0,
-			pic:'',
-			personNum:0,
-			buy:false,
- 			up: {
- 				name: '',
- 				id: ''
- 			},
- 			down: {
- 				name: '请选择',
- 				id: ''
- 			},
-			oplist:[],
- 			ticket: {
- 				price1: 0,
- 				price2: 0,
- 			},
-			list:[
-				{
-					id:1,
-					name:"儿童票"
-				},{
-					id:2,
-					name:"成人票"
-				}
-			],
- 			underLine: 1,
- 			op: {
-
- 			}
- 		}
- 	},
- 	 
- 	methods: {
-		
-		radioGroupChange(){
-			var ptotal=this.getTotal();
-			
-			ptotal+=parseFloat(this.pnum)
-			this.total=ptotal;
-		},
-		getTotal(){
-			var ptotal=0;
-			
-			for(var i in this.oplist){
-				if(this.oplist[i].ticketType=="1"){
-					ptotal+=parseFloat(this.ticket.price1*100)
-				}
-				if(this.oplist[i].ticketType=="2"){
-					ptotal+=parseFloat(this.ticket.price2*100)
-				}
-			}
-			return ptotal/100;
-		},
-		personDelete(){ 
-		},
- 		deleteBtn() {
-			this.$refs.common.setFnc(this.personDelete)
- 			 this.$refs.common.confirm('是否删除该乘车人信息?')
- 		},
- 		select() {
- 		 
-
- 			uni.navigateTo({
- 				url: '/pages/buytickets/selectSite?select=true&id=' + this.id
- 			})
- 		},
-		submit(id) {
-			this.$refs.common.showLoading();
-		
-		console.log("Pay+"+new Date().getTime())
-		
-			Pay.wxpay(id).then((response) => {
-				if(!response.result){
-					this.$refs.common.showLoading(false, response.message);
-					return
-				}
-				var data = response.data
-				var url = window.location.href.split("#")[0] + "/#/pages/buytickets/success";
-				
-				var obj = {
-					...data,
-					url: url
-				}
-				console.log("Pay+"+new Date().getTime())
-				
-				wxPayJs(obj);
-		
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-		
-			})
-		},
- 		clickBtn(bl) {
- 			var obj = this.carhelp.get("form")
- 		
- 			//obj = this.carhelp.set("form", obj)
-			this.$refs.common.showLoading();
-			var arr=[]
-			var arr2=[]
-			for(var i in obj.oplist){
-				arr.push(obj.oplist[i].id);
-			}
-			for(var i in this.oplist){
-				arr2.push(this.oplist[i].ticketType);
-			}
-			
-			var thisform={
-				id:this.id,
-				mergeOrderId:obj.mergeOrderId,
-				openId:this.carhelp.getOpenId(),
-				passengerIds:arr.join(),
-				ticketUpStationId:this.up.id,
-				ticketDownStationId:this.down.id,
-				ticketTypes:arr2.join(),
-				goodsTicket:this.pnum,
-				totalFee:this.total
-			}
-			if(obj.op){
-				 
-			}else{
-				API.createPassengerOrder(thisform).then((response) => {
-				
-					if(this.buy||bl==true){
-						this.submit(response.data.MergeOrderDTO.id);
-					}else{
-						obj.oplist=[];
-						obj.ticket=null;
-						obj = this.carhelp.set("form", obj)
-						uni.reLaunch({
-							url: '/pages/buytickets/home?id=' + this.id 
-						})
-					}
-					
-					console.log(response)
-				}).catch(error => {
-					this.$refs.common.showLoading(false, error);
-				
-				})
-			}
-			
- 		},
- 		
- 	 
- 		underLineChange(index) {
- 			this.underLine = index;
- 			console.log('当前值为: ' + index)
-
- 		},
-		ticketAmount(){
-
-			this.$refs.common.showLoading();
-			
-			var thisform={
-				ticketUpStationId:this.up.id,
-				ticketDownStationId:this.down.id,	
-				ticketDownStationName:this.down.name,
-				price1:0,
-				price2:0
-			}
-			thisform.ticketType=1;
-			var obj= this.carhelp.get("form");
-			 
-			API.ticketAmount(thisform).then((response) => {
-				thisform.price1=response.data.price
-				thisform.ticketType=2;
-				API.ticketAmount(thisform).then((response2) => {
-					thisform.price2=response2.data.price
-					this.ticket=thisform;
-					this.radioGroupChange()
-					obj.ticket=thisform;
-					this.carhelp.set("form",obj);
-					this.$refs.common.showLoading(false);
-					
-				})
-				
-			
-			}).catch(error => {
-				this.$refs.common.showLoading(false, error);
-			
-			})
-			
-		},
- 	},onReady(){
-		var obj = this.carhelp.get("form");
-		
-		if(this.uid && !obj.ticket){
-			this.ticketAmount();
-		}
-		
-	},
- 	onLoad(op) {
- 		this.id = op.id;
- 		var obj = this.carhelp.get("form");
-		this.buy=obj.buy;
-		this.oplist=obj.oplist;
-		for(var i  in this.oplist){
-			if(!this.oplist[i].ticketType){
-				this.oplist[i].ticketType="2"
-			}
-		}
-		
-		this.up.name = obj.oplist[0].upStationName;
-		this.up.id = obj.oplist[0].upStationId;
-		
-		this.personNum=obj.oplist.length
-		
- 		if (obj.ticket) {
- 			this.ticket = obj.ticket;
-			this.radioGroupChange()
- 			this.down = {
- 				id: obj.ticket.ticketDownStationId,
- 				name: obj.ticket.ticketDownStationName
- 			}
- 		}
- 		
- 	}
- }

+ 0 - 230
pages/buytickets/site.vue

@@ -1,230 +0,0 @@
-<template>
-	<view>
-		<car-common  ref="common"></car-common>
-		
-		
-		<u-navbar title="购买车票">
-			<view class="slot-wrap"></view>
-			<view class="navbar-right"  v-if="uid" @click="deleteBtn" >
-				<u-icon name="shanchu" custom-prefix="custom-icon" size="40" :color="uid?'red':'#999'"></u-icon>
-				<span :style="uid?'color:red':''">删除</span>
-			</view>
-		</u-navbar>
-		
-		<view class="site">
-			<view class="site-head">
-				<view class="site-head-up">
-					<view class="title">
-						<view class="circle"></view>
-						<span>上车站点</span>
-					</view>
-					<view class="site-head-img"  v-if="false">
-						<view class="site-head-img-item" v-if="false">
-						</view>
-						<u-avatar size="large"     v-for="item,i in oplist" :key="i" :src="item.imageUrl"></u-avatar>
-						
-						<u-avatar size="large" v-if="pic"   :src="pic"></u-avatar>			
-					</view>
-					
-					<view class="content">
-						<span>{{up.name}}</span>
-					</view>
-				</view>
-				<view class="site-head-down">
-					<view class="title">
-						<view class="circle"></view>
-						<span>下车站点</span>
-					</view>
-					<view class="content" @click="select">
-						<span v-text="down.name" :style="down.id?'':'color:#999'">宿架转盘</span>
-					</view>
-				</view>
-			</view>
-			<view class="site-foot">
-				<view class="site-foot-row"   v-for="item,i in oplist" :key="i">
-					<span>
-						<u-avatar size="large"     :src="item.imageUrl"></u-avatar>
-					</span>
-					<h3 v-if="buy">{{item.ticketTypeName}}</h3>
-					
-					<u-radio-group  v-if="!buy" v-model="item.ticketType" @change="radioGroupChange">
-								<u-radio 
-									v-for="(item, index) in list" :key="index" 
-									:name="item.id"
-								>
-									{{item.name}}
-								</u-radio>
-							</u-radio-group>
-							
-					
-				</view>
-				<view class="site-foot-row">
-					<span>货票(元)</span>
-					<u-number-box v-model="pnum" @change="radioGroupChange" ></u-number-box>
-				</view>
-				<view class="site-foot-row">
-					<span>应付金额</span>
-					<h3>¥{{total}}</h3>
-				</view>
-			</view>
-		</view>
-		<view class="upload-button" v-show="down.id">
-			<u-button type="primary"  shape="circle" @click="clickBtn(true)">支付</u-button>
-		</view>
-		<view class="upload-button" v-show="!down.id">
-			<u-button type="default" class="gray-btn" shape="circle">支付</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from './site.js'
-	export default api;
-	
-	
-</script>
-
-<style>
-	page{background-color: #f7f7f7;}
-</style>
-<style scoped lang="scss">
-	.gray-btn{
-		background-color: #bfbfbf;
-		color:#fff;
-		border-color: #bfbfbf;
-	}
-	.slot-wrap {
-		display: flex;
-		align-items: center;
-		flex: 1;
-	}
-	.navbar-right {
-		display: flex;
-		margin-right: 20rpx;
-		span{
-			color:#999;
-			margin-left: 3px;
-		}
-	}
-	.navbar-left{
-		display: flex;
-		align-items: center;
-		margin-left: 20rpx;
-		span{
-			margin-right: 6rpx;
-			font-size: 14px;
-		}
-	}
-	.site{
-		background-color: #fff;
-		margin: 10px;
-		border-radius: 10px;
-		box-shadow:3px 3px 3px rgba(0,0,0,0.1);
-		.site-head{
-			border-bottom:1px dashed #eee;
-			padding: 10px;
-			position: relative;
-			padding-top: 40px;
-			&:before{
-				content: '';
-				position: absolute;
-				height: 30rpx;
-				width: 30rpx;
-				background-color: #f7f7f7;
-				border-radius: 50%;
-				left: -15rpx;
-				bottom:-15rpx;
-			}
-			&:after{
-				content: '';
-				position: absolute;
-				height: 30rpx;
-				width: 30rpx;
-				background-color: #f7f7f7;
-				border-radius: 50%;
-				right: -15rpx;
-				bottom:-15rpx;
-			}
-		}
-		.site-head-up{
-			margin-bottom: 20px;
-			position: relative;
-			.site-head-img{
-				position: absolute;
-				left: 50%;
-				margin-left: -150px;
-				top:-70px;
-				height: 64px;
-				width:300px;
-				display: flex;
-				justify-content: center;
-				.site-head-img-item{
-					height: 60px;
-					width:60px;
-					box-shadow:3px 3px 3px rgba(0,0,0,0.1);
-					border: 2px solid #fff;
-					border-radius: 50%;
-				}
-			}
-			.title{
-				display: flex;
-				align-items: center;
-				margin-bottom: 10rpx;
-				span{
-					margin-left: 10rpx;
-				}
-			}
-			.content{
-				span{
-					font-size: 24px;
-				}
-			}
-			.circle{
-				height: 24rpx;
-				width: 24rpx;
-				border-radius: 50%;
-				background-color: #fff;
-				border: 3px solid #22ac38;
-			}
-		}
-		.site-head-down{
-			.title{
-				display: flex;
-				align-items: center;
-				margin-bottom: 10rpx;
-				span{
-					margin-left: 10rpx;
-				}
-			}
-			.content{
-				span{
-					font-size: 24px;
-				}
-			}
-			.circle{
-				height: 24rpx;
-				width: 24rpx;
-				border-radius: 50%;
-				background-color: #fff;
-				border: 3px solid #ff6868;
-			}
-		}
-		.site-foot{
-			padding: 10px;
-			.site-foot-row{
-				display: flex;
-				justify-content: space-between;
-				padding: 10px 0;
-				span{
-					font-size: 15px;
-				}
-			}
-		}
-	}
-	.upload-button{
-		position: fixed;
-		left: 30rpx;
-		bottom:30rpx;
-		right: 30rpx;
-	}
-</style>

+ 0 - 50
pages/buytickets/success.js

@@ -1,50 +0,0 @@
-
-import * as API from '@/apis/common.js'
-
-	export default {
-		data() {
-			return {
-				id:"",
-				pay:{
-					list:[]
-				}
-			}
-		},
-		methods: {
-			lookBtn(){
-				uni.navigateTo({
-					 url: '/pages/my/user/bybusList'
-				})
-			},
-			getPay(){
-				this.$refs.common.showLoading();
-								
-				API.mergeInfo(this.id).then((response) => {
-					
-					this.pay=response.data;
-					this.$refs.common.showLoading(false);
-				}).catch(error => {
-					this.$refs.common.showLoading(false, error);
-				})	
-			},
-			gotoHome(){
-				uni.switchTab({
-				    url: '/pages/index/index'
-				});
-			},
-			backBtn(){
-				uni.redirectTo({
-					 url: '/pages/buytickets/index?id='+this.pay.id
-				})
-			}
-		},
-		onLoad(op) {		
-			 this.id=op.id;	
-		},onReady(){
-			if(!process.car.SIMPLE_RUN){
-				this.getPay();
-			}
-			
-		}
-	}
-

+ 0 - 151
pages/buytickets/success.vue

@@ -1,151 +0,0 @@
-<template>
-	<view>
-		<car-common    ref="common"  ></car-common>
-		
-		<u-navbar title="缴费结果"  :is-back="false">
-			<view class="slot-wrap"></view>
-			<view class="navbar-right"  @click="gotoHome"  >
-				<u-icon name="home-fill" color="#999" size="28"></u-icon>
-				<span >前往首页</span>
-			</view>
-		</u-navbar>
-		
-		<view class="success">
-			<u-icon name="checkmark-circle-fill" color="#08d152" size="200"></u-icon>
-			<h3>支付成功</h3>
-		</view>
-		
-		<view class="ticket-item" v-for="item,i in pay.list" :key="i" >
-			<view class="ticket-item-left" >
-				<view class="ticket-head">
-					<h3>{{item.startStation}} - {{item.endStation}}</h3>
-				</view>
-				<view class="ticket-text">
-					<view class="ticket-text-row">
-						<p>票种:</p><span>{{item.ticketTypeName}}</span>
-					</view>
-					<view class="ticket-text-row">
-						<p>货票:</p><span>¥{{item.goodTicket}}</span>
-					</view>
-				</view>
-			</view>
-			<view class="ticket-item-right">
-				<u-avatar :src="item.imageUrl" size="default"></u-avatar>
-				<h3>{{item.totalFee}}</h3>
-			</view>
-		</view>
-		<view class="upload-button">
-			<u-button class="upload-btn" type="primary" shape="circle" @click="backBtn" plain>继续购票</u-button>
-			<u-button class="upload-btn" type="primary" shape="circle" @click="lookBtn">查看购票记录</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from './success.js'
-	export default api;
-</script>
-
-<style>
-	page{
-		background-color: #f7f7f7;
-	}
-</style>
-<style scoped lang="scss">
-	.ticket-item{
-		background-color: #fff;
-		margin:20rpx;
-		border-radius: 10px;
-		display: flex;
-		justify-content: space-between;
-		box-shadow:3px 3px 3px rgba(0,0,0,0.1);
-		.ticket-item-left{
-			padding: 30rpx;
-			.ticket-head{
-				display: flex;
-				align-items: center;
-			}
-			.ticket-text{
-				margin-top: 20rpx;
-				.ticket-text-row{
-					display: flex;
-					align-items: center;
-					margin-bottom: 10rpx;
-					&:last-child{
-						margin-bottom: 0;
-					}
-					span{
-						color:#007AFF
-					}
-				}
-			}
-		}
-		.ticket-item-right{
-			width: 120px;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			border-left: 1px dashed #eee;
-			position: relative;
-			padding: 20rpx;
-			&:before{
-				content: '';
-				position: absolute;
-				height: 30rpx;
-				width: 30rpx;
-				background-color: #f7f7f7;
-				border-radius: 50%;
-				left: -15rpx;
-				top:-15rpx;
-			}
-			&:after{
-				content: '';
-				position: absolute;
-				height: 30rpx;
-				width: 30rpx;
-				background-color: #f7f7f7;
-				border-radius: 50%;
-				left: -15rpx;
-				bottom:-15rpx;
-			}
-			h3{
-				color:#007AFF;
-				font-size:24px;
-			}
-		}
-		
-	}
-	.upload-button{
-		display: flex;
-		font-size:24px;
-		position: fixed;
-		left: 30rpx;
-		bottom:30rpx;
-		right: 30rpx;
-		.upload-btn{
-			flex: 1;
-			&:first-child{
-				margin-right: 10px;
-			}
-		}
-	}
-	.success{
-		text-align: center;
-		padding: 100rpx 0 40rpx;
-		
-	}
-	.navbar-right {
-			display: flex;
-			margin-right: 20rpx;
-			span{
-				color:rgb(96, 98, 102);
-				margin-left: 3px;
-			}
-		}
-		.slot-wrap {
-				display: flex;
-				align-items: center;
-				flex: 1;
-			}
-</style>

+ 0 - 32
pages/buytickets/upload.js

@@ -1,32 +0,0 @@
-
-import * as WxJsApi from '@/utils/wxJsApi.js'
-
-	export default {
-		data() {
-			return {
-				imgBase64:'',
-				step:1,
-			}
-		},
-		methods: {
-			
-			uploadPic(){
-			 WxJsApi.chooseImage(9,true).then(res=>{
-				var localId=res[0]
-				uni.navigateTo({
-					url:'/pages/buytickets/adjust?localId='+localId
-				})
-			 })
-			 
-			}
-		},
-		
-		onReady() {
-			this.$refs.common.showLoading()
-			 WxJsApi.getWxConfig(['chooseImage']).then(()=>{
-				 this.$refs.common.showLoading(false)
-			 });
-	
-		}
-	}
-

+ 0 - 96
pages/buytickets/upload.vue

@@ -1,96 +0,0 @@
-<template>
-	<view  >
-		<car-common :login="true" mytitle="上传照片" ref="common"></car-common>
-			<view class="upload">
-				<h4>确认本人操作</h4>
-				<view class="upload-img">
-					<img src="static/img/face1.png" alt="" v-if="!imgBase64">
-					<img :src="imgBase64" v-if="imgBase64" />
-				</view>
-				<p>1.为了确保您的乘车信息的安全和真实性,我们需要对您进行人脸信息的匹配</p>
-				<p>2.请您本人亲自完成,请将脸部置于提示框内,并按提示</p>
-				<view class="upload-step">
-					<view class="upload-step-item">
-						<img src="static/img/icon-face-1.png" alt="">
-						<span>摘下遮挡物</span>
-					</view>
-					<view class="upload-step-item">
-						<img src="static/img/icon-face-2.png" alt="">
-						<span>正对手机</span>
-					</view>
-					<view class="upload-step-item">
-						<img src="static/img/icon-face-3.png" alt="">
-						<span>光线充足</span>
-					</view>
-				</view>
-			</view>
-			<view class="upload-button">
-				<u-button type="primary" shape="circle" @click="uploadPic">上传照片</u-button>
-			</view>
-	
-		
-		
-	</view>
-</template>
-
-<script>
-	import api from './upload.js'
-	export default api;
-</script>
-
-<style scoped lang="scss">
-	 
-	.upload {
-		padding: 100rpx 50rpx;
-
-		h4 {
-			text-align: center;
-			font-size: 36rpx;
-		}
-
-		p {
-			color: #909090;
-			margin-bottom: 20rpx;
-		}
-
-		.upload-img {
-			height: 220px;
-			width: 176px;
-			margin: 40rpx auto;
-
-			img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.upload-step {
-			display: flex;
-			justify-content: space-between;
-			padding: 10px 0;
-
-			.upload-step-item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				img {
-					height: 60px;
-					width: 60px;
-				}
-
-				span {
-					margin-top: 10rpx;
-					font-size: 14px;
-				}
-			}
-		}
-	}
-
-	.upload-button {
-		position: fixed;
-		left: 30rpx;
-		bottom: 30rpx;
-		right: 30rpx;
-	}
-</style>

+ 0 - 22
pages/buytickets/view.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

+ 0 - 138
pages/car/login.js

@@ -1,138 +0,0 @@
-import * as API_user from '@/apis/user'
-import {
-		checkPhone,
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				openId:"",
-				subFormCode: {
-					phone: '',
-					openId: '',
-					verifyCode: ''
-				},
-				isSendMsgIng: false,
-				sendMsgSecond: 60,
-				back:false,
-			}
-		},
-		methods: {
-			gotoHome(){
-				uni.switchTab({
-				    url: '/pages/index/index'
-				});
-			},
-			codeCheckForm() {
-				let phoneResult = checkPhone(this.subFormCode.phone);
-				if (typeof phoneResult == 'string') {
-				
-				
-					this.$refs.common.alert(phoneResult)
-					return false;
-				} else if (!this.subFormCode.verifyCode) {
-				
-					this.$refs.common.alert('请输入验证码')
-					
-					return false;
-				} else {
-					return true;
-				}
-			},
-			login() {
-				this.codeSubmit();
-				
-			},
-			//验证码登录
-			codeSubmit() {
-				if (this.codeCheckForm()) {
-					this.$refs.common.showLoading()
-					API_user.validateCode(this.subFormCode).then(response => {
-						  
-						if(response.data){
-							var token = response.data ? response.data.token : '';
-							this.carhelp.setToken(token);
-							this.carhelp.setPersonInfo(response.data.userInfo)
-							
-							this.loginSuccess();
-						}else{
-							 
-							this.$refs.common.showLoading(false,response.message);
-						}
-					
-			
-					}).catch(error => {					
-						this.$refs.common.showLoading(false,error);	
-					})
-				}
-			},
-			//发送验证码
-			sendMsg() {
-				
-				
-				if (!this.isSendMsgIng) {
-					let phoneResult = checkPhone(this.subFormCode.phone);
-					if (typeof phoneResult == 'string') {
-					  
-						this.$refs.common.alert(phoneResult)
-					} else {
-					this.$refs.common.showLoading()
-						API_user.getVerifyCode(this.subFormCode).then(response => {
-							this.$refs.common.showLoading(false) 
-							if(response.message){
-								//倒计时
-								this.msgTimeInterval();
-							}else{
-								this.$refs.common.alert("您的验证码已经发送[5分钟有效],请勿重复点击")
-							}
-							
-						}).catch(error => {
-						 
-							this.$refs.common.alert(error)
-						})
-					}
-				}
-			},
-			//倒计时
-			msgTimeInterval() {
-				this.isSendMsgIng = true;
-				var time = this.sendMsgSecond;
-				var _this = this;
-				this.timer = setInterval(() => {
-					if (time > 0) {
-						_this.sendMsgSecond = time--;
-					} else {
-						_this.isSendMsgIng = false;
-						_this.sendMsgSecond = 60;
-						clearInterval(_this.timer)
-					}
-				}, 1000)
-			},	//登录成功
-			loginSuccess() {
-			 
-				uni.switchTab({
-				    url: '/pages/my/index'
-				});
-			},
-		},
-		onLoad(temp) {
-			 
-			var ob=this.carhelp.getPersonInfo()
-			if(ob){
-				this.loginSuccess()
-			}
-			if(temp.back){
-				this.back=true;
-			}
-			console.log(ob)
-			this.subFormCode.openId = this.carhelp.getOpenId();
-			
-			if (process.car.SIMPLE_RUN) {
-				this.subFormCode.openId = "test";
-				
-			}
-			console.log(this.carhelp.getPrefix())
-			
-				
-		}
-	}
-

+ 0 - 127
pages/car/login.vue

@@ -1,127 +0,0 @@
-<template>
-	
-	<view class="login">
-		<car-common   ref="common"  ></car-common>
-		<u-navbar title="登录"  :is-back="false">
-			<view class="slot-wrap"></view>
-			<view class="navbar-right"  @click="gotoHome" >
-				<u-icon name="home-fill" color="#999" size="28"></u-icon>
-				
-				<span >前往首页</span>
-			</view>
-		</u-navbar>
-		<view class="login-logo">
-			<img src="static/img/logo_1.png" alt="">
-		</view>
-		<view class="login-name">车信达</view>
-		<view class="login-form">
-			<view class="login-form-row">
-				<view class="login-form-title">
-					<u-icon name="zhanghao" custom-prefix="custom-icon"  size="38" color="#1677ff"></u-icon>
-				</view>
-				<view class="login-form-input">
-					<u-input placeholder="请输入手机号" v-model="subFormCode.phone" type="text"></u-input>
-				</view>
-			</view>
-			<view class="login-form-row">
-				<view class="login-form-title">
-					<u-icon name="yanzhengma" custom-prefix="custom-icon"  size="38" color="#1677ff"></u-icon>
-				</view>
-				<view class="login-form-input">
-					<u-input placeholder="请输入验证码" maxlength="6" v-model="subFormCode.verifyCode" type="number"  ></u-input>
-				</view>
-				<view class="login-form-code">
-					<span @click="sendMsg" v-text="isSendMsgIng?(sendMsgSecond+'秒'):'发送验证码'" >发送验证码</span>
-				</view>
-			</view>
-			<view class="login-button">
-				<u-button type="primary" shape="circle" @click="login" >立即登录</u-button>
-			</view>
-			<view class="forget" v-if="false" ><span>忘记密码?</span></view>
-			<view class="login-foot">
-				<p>登录即为同意</p><span>《用户协议》</span><span>《隐私政策》</span> 
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from './login.js'
-	export default api;
-	
-</script>
-
-<style scoped lang="scss">
-	.login{
-		text-align: center;
-	}
-	.login-logo{
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 20px;
-		overflow: hidden;
-		margin: 160rpx auto 0;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.login-name{
-		font-size:16px;
-		font-weight: bold;
-		margin-top: 20rpx;
-	}
-	.login-form{
-		width: 300px;
-		margin: 30px auto;	
-	}
-	.login-form-row{
-		display: flex;
-		align-items: center;
-		padding: 20rpx 0;
-		border-bottom: 1px solid #f7f7f7;
-		position: relative;
-		.login-form-title{
-			margin-right: 20rpx;
-		}
-		.login-form-input{
-			flex: 1;
-			padding-right: 20rpx;
-		}
-	}
-	.login-button{
-		margin: 40rpx 0;
-	}
-	.navbar-right {
-			display: flex;
-			margin-right: 20rpx;
-			span{
-				color:rgb(96, 98, 102);
-				margin-left: 3px;
-			}
-		}
-	.slot-wrap {
-			display: flex;
-			align-items: center;
-			flex: 1;
-		}
-	.forget{
-		text-align: right;
-		color:#1677ff;
-	}
-	.login-form-code{
-		color:#1677ff;
-	}
-	.login-foot{
-		display: flex;
-		text-align: center;
-		position: fixed;
-		bottom:20rpx;
-		left:50%;
-		margin-left:-250rpx;
-		color:#999;
-		span{
-			color:#1677ff
-		}
-	}
-</style>

+ 27 - 0
pages/hr/index/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/index/index.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/index/resumeInfo/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/index/resumeInfo/resumeInfo.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 16 - 0
pages/hr/my/collection/collection.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/my/collection/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/my/enroll/enroll.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/my/enroll/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/my/follow/follow.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/my/follow/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 27 - 0
pages/hr/my/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/my/my.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/my/position/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/my/position/position.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/newsIndex/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/newsIndex/newsIndex.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/newsIndex/newsList/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/newsIndex/newsList/newsList.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/newsIndex/newsRecommend/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/newsIndex/newsRecommend/newsRecommend.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/newsIndex/servicesInfo/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/newsIndex/servicesInfo/servicesInfo.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/newsIndex/servicesList/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/newsIndex/servicesList/servicesList.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/query/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/query/query.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/hr/query/queryResult/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/hr/query/queryResult/queryResult.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 10 - 390
pages/index/index.js

@@ -1,407 +1,27 @@
-import * as WxJsApi from '@/utils/wxJsApi.js'
+//import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/index.js'
 
 export default {
 		data() {
 			return {
-				isReady:false,
-				rbool:false,
-				wxinit:false,
-				index:0,
-				btn:{
-					color: '#1677FF'
-				},
-				remindBl:false,
-				remindInfo:null,
-				isLoading:false,
-				getPointBl:false,//是否定位完成
-				longitude: '',
-				latitude: '',
-				optionsName:'荆州',
-				options1:[
-					 
-				],
-				list: [ ],
-				siteList:[
-				],
-				radiolist: [
-					{
-						name: '不提醒',
-						isRemind: "0",
-					},
-					{
-						name: '提前1站',
-						isRemind: "1",
-					},
-					{
-						name: '提前2站',
-						isRemind: "2",
-					}
-				],
-				// u-radio-group的v-model绑定的值如果设置为某个radio的name,就会被默认选中
-				value: 'orange',
+				isReady:false,
 			}
 		},
-		onLoad(){
-			
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
 		},
 		methods: {
+			 
 			
-			// 选中某个单选框时,由radio时触发
-			radioChange(e) {
-				// console.log(e);
-			},
-			// 选中任一radio时,由radio-group触发
-			remindHD(){
-				
-				
-				var item= this.remindInfo
-				
-				if(item.isRemind==0){
-					if(this.remindInfo.remindId){
-						this.del(item.remindId,item.isRemind!=0)
-					}
-					return
-				}
-				if(item.remindId){
-					this.del(item.remindId,item.isRemind!=0)
-				}else{
-					this.add()
-				}
-				
-				
-			},
-			del(id,bl){
-				API.cancelRemind(id).then((res) => {
-					this.remindInfo.remindId=""
-					if(bl){
-						this.add()	
-					}else{
-						this.$refs.common.alert( "设置成功");
-					}
-				}).catch(error => {
-						this.$refs.common.alert( error);
-				}) 
-			},
-			 add(){
-				 var item= this.remindInfo
-				 var obj={
-				 	startStationId:item.startStationId,
-				 	remindStationId :item.ticketDownStationId,
-				 	stopInAdvance:item.isRemind,
-				 	remindType:"2",
-				 	vehicleShiftId:item.vehicleShiftId,
-				 	openId:this.carhelp.getOpenId()
-				 }
-				 API.saveRemind(obj).then((res) => {
-				 	item.remindId=res.data.id
-					this.$refs.common.alert( "设置成功");
-				 
-				 }).catch(error => {
-				 		this.$refs.common.alert( error);
-				 }) 
-			 },
-			radioGroupChange(item) {
-				this.remindHD();
-			},
-			
-			getRemindInfo(){
-				
-				API.queryRemind(this.carhelp.getOpenId()).then((res) => {
-					
-					if(res.data.length){
-						this.remindInfo=res.data[0]
-						var obj=this.remindInfo
-						if(obj.remindId){
-							this.rbool=true;
-							obj.isRemind=obj.stopInAdvance;
-						}else{
-							obj.isRemind="0";
-						}
-					}
-				}).catch(error => {
-						this.$refs.common.alert( error);
-				})  
-			},
-			 
-			getNewNum(){
-				
-				
-				var pages = getCurrentPages();
-				var page = (pages[pages.length - 1]).route;
-			
-				
-				
-				if(page=="pages/index/index"||
-				page=="pages/my/index"||
-				page=="pages/news/index"){
-					setTimeout(this.getNewNum,10000)
-				}else{
-					setTimeout(this.getNewNum,1000)
-					return;
-				}
-				var data={
-						openId:this.carhelp.getOpenId()
-					};
-				
-					if(!this.carhelp.getOpenId()){
-						return
-					}
-				API.passengerMessageNoReadNum(data).then((res) => {
-					var num=res.data.num;
-					
-					
-					if(num){
-						uni.setTabBarBadge({
-						  index: 2,
-						  text: num+''
-						})
-					}else{
-						 uni.removeTabBarBadge({
-								 index:2
-						})
-					}
-				}).catch(error => {
-					
-				})   
-				
-			
-			
-		} ,
-			getBanner() {
-			      API.getBannerInfo("1").then((res) => {
-			      	this.list=res.data;
-					for(var i in this.list){
-						var obj=this.list[i]
-						obj.url=obj.linkUrl
-						obj.image=obj.picUrl
-						obj.title=obj.name
-					}
-					this.carhelp.set("bannerList",this.list);
-			      }).catch(error => {
-			      	this.$refs.common.alert( error);
-			      })     
-			},
-			getOwnerRegion(){
-				var obj={
-					longitude:this.longitude,
-					latitude:this.latitude
-				}
-				API.getOwnerRegion(obj).then((res) => {
-				 	//this.options1=res.data;
-					 
-				}).catch(error => {
-					this.$refs.common.alert( error);
-				})  
-			},
-			setRegion(){
-				var obj={
-					longitude:this.longitude,
-					latitude:this.latitude
-				}
-				API.getOwnerRegion(obj).then((res) => {
-					
-					var index=0;
-					var regionN = this.carhelp.get("car_region");
-					var region=res.data.id;
-					var obj1={};
-					var obj2={};
-					for(var i in 	this.options1 ){
-						if(this.options1[i].id==region){
-							index=i;
-							obj1=this.options1[i]
-						}
-						if(this.options1[i].id==regionN){
-							this.index=i;	
-							obj2=this.options1[i]
-						}
-					}
-					
-					if(regionN&&regionN!=region){
-						
-						var nowDate =new Date();
-						var curDay=nowDate.getFullYear()*10000+(nowDate.getMonth()+1)*10000+nowDate.getDate()*10000+nowDate.getHours()*100+nowDate.getMinutes();
-						var temp = this.carhelp.get("car_region_cur");
-						var i=30;
-						if(process.car.NODE_ENV!="prod"){
-							i=3
-						}
-						
-						if(temp&&temp+i>curDay){
-							return
-						}
-						this.carhelp.set("car_region_cur",curDay);
-						
-						//是否切换
-						this.$refs.common.setFnc(()=>{
-							 this.index=index;
-							 this.carhelp.set("car_region",region);
-						})
-						this.$refs.common.confirm('定位显示您在“'+obj1.name+'”,是否切换','切换')
-					}else{
-						this.index=index;
-						this.carhelp.set("car_region",region);
-					}
-				
-				}).catch(error => {
-					this.$refs.common.alert( error);
-				})  
-			},
-			getRegion(bl) {
-			      API.getRegionList().then((res) => {
-			       	this.options1=res.data;
-					if(this.options1.length){
-						this.carhelp.set("car_region_temp",	this.options1[0].id);
-					}
-					var region= this.carhelp.get("car_region");
-					if(region){
-						for(var i in 	this.options1 ){
-							if(this.options1[i].id==region){
-								this.index=i;
-								break;
-							}
-						}
-					}
-					 if(bl){	 
-						   this.setRegion();
-					 }
-					
-			      }).catch(error => {
-			      	this.$refs.common.alert( error);
-			      })     
-			},
-			 bindPickerChange: function(e) {
-			         
-			            this.index = e.target.value
-						var obj=this.options1[ this.index];
-						var nowDate=new Date();
-						var curDay=nowDate.getFullYear()*10000+(nowDate.getMonth()+1)*10000+nowDate.getDate()*10000+nowDate.getHours()*100+nowDate.getMinutes();
-						this.carhelp.set("car_region_cur",curDay);
-						this.carhelp.set("car_region",obj.id);
-						
-			},
-			gotoQuery(){
-				uni.navigateTo({
-					url:'/pages/query/index?back=true'
-				})
-			},
-			gotoLine(item,downid){
-				uni.navigateTo({
-					url:'/pages/route/index?id='+item.routeId+"&upid="+item.startStationId+"&downid="+downid
-				})
-				
-			},
-			gotoLineList(downid){
+		},onReady(){ 
 			
-				uni.navigateTo({
-					url:"/pages/index/sitePage?id="+downid+"&longitude="+this.longitude+"&latitude="+this.latitude
-				})
-				
-			},
-			getPoint() {
-			this.$refs.common.alert("正在获取定位信息,为您查找附近的站点...");
-			
-				
-				WxJsApi.getLocation().then((res) => {
-					
-					var latitude = parseFloat(res.latitude);
-					var longitude = parseFloat(res.longitude);
-			
-					this.latitude = latitude;
-					this.longitude = longitude;
-					
-					 this.getRegion(true);
-					
-					//this.$refs.common.alert("定位中...",);
-					this.passengerNearbyStation()
-					this.getPointBl=true
-					this.$refs.common.showLoading(false);
-				}).catch(error => {
-					this.$refs.common.alert( error);
-					
-				})
-			},
-			passengerNearbyStation(){
-				if(process.car.SIMPLE_RUN){
-					this.latitude = '30.306452';
-					this.longitude = '112.27642';
-				}
-			
-				
-				var form={
-					longitude:this.longitude,
-					latitude:this.latitude,
-					pageIndex:1,
-					pageSize:5
-				}
-				this.$refs.common.showLoading();
-				API.passengerNearbyStation(form).then((res) => {
-					this.siteList=res.data;
-					this.isLoading=true;
-					//this.$refs.common.showLoading(fa);
-					if(this.siteList.length){
-						this.$refs.common.alert( "已为您查询出附近的站点");
-					}else{
-						this.$refs.common.alert( "查询成功,附近暂无站点信息!");
-					}
-				}).catch(error => {
-					this.$refs.common.alert( error);
-				})
-			},
-			getScan(){
-				this.$refs.common.showLoading()
-				WxJsApi.scanQRCode(0,this.$refs.common).then(function(url){
-					console.log(url)
-					
-					window.location.href=url;
-				}).catch(error => {
-					this.$refs.common.showLoading(false,error)
-					
-				});
-			},
-			clickSwiper(index){
-				
-				var url=this.list[index].url;
-				if(url){
-					if(url.indexOf("http")==0){
-						window.location.href=url;
-					}else if(url.indexOf("/pages/")==0){
-						uni.navigateTo({
-							url:this.list[index].url
-						})
-					}
-				}
-			},
-			closeDropdown() {
-				this.$refs.uDropdown.close();
-			}
-		},onReady(){
-			WxJsApi.getWxConfig(['getLocation','addEventListener']).then(()=>{
-				this.wxinit=true;
-				var _this=this;
-			 
-			})	
-			//WxJsApi.requestSubscribeMessage(['Ilxy2TX264A3RHqRyDZqL_xUDxi9OuBNeJoDOBfMRHg'])
-			
-			var list=this.carhelp.get("bannerList");
-			if(list){
-				this.list=list;
-			}
-			//this.remindHD()
-			this.getPoint();
-			this.getBanner();
-			this.getNewNum();
-			this.getRemindInfo();
-		 
-			this.getRegion();
-			//清空缓存
-			this.carhelp.set("form",{});
 			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
-				this.getPoint();
-				this.getRemindInfo();
-			}
 				
+			}	
 		},
 	}

+ 20 - 205
pages/index/index.vue

@@ -1,207 +1,22 @@
-<template>
-	<view class="content">
-		<car-common   ref="common"  ></car-common>
-		
-		<u-navbar :is-back="false" title="">	
-			<view class="slot-wrap">
-				<view class="navbar-left">
-					  <picker :value="index" @change="bindPickerChange" range-key="name" :range="options1">
-					          <view class="uni-input" v-if="options1.length">{{options1[index].name}}
-								<u-icon name="arrow-down" color="#999" size="28"></u-icon>			  
-							  </view>					  
-					   </picker>
-				</view>				
-				<view class="search-wrap" >
-					<u-search placeholder="搜索线路" @click="gotoQuery" :disabled="true" :show-action="false"></u-search>
-				</view>
-				<!-- <view class="navbar-right"  @click="getScan">
-					<u-icon name="saoma" custom-prefix="custom-icon" size="40" color="#333"></u-icon>
-				</view> -->
-			</view>
-			
-		</u-navbar>	
-		<view class="banner" v-show="list.length">
-			<u-swiper height="200" :list="list" @click="clickSwiper"></u-swiper>
-		</view>
-		
-	<view class="remind"   v-if="remindInfo">
-		<h3>{{remindInfo.currentStationName}} - {{remindInfo.ticketDownStationName}}</h3>
-		<p>线路:{{remindInfo.routeName}} 当前:{{remindInfo.currentStationName}}</p>
-		<view class="remind-radio">
-			<span>到站提醒:</span>
-			<u-radio-group v-model="remindInfo.isRemind" @change="radioGroupChange" active-color="#fff">		
-				<u-radio 
-					@change="radioChange" 
-					v-for="(dio, index) in radiolist" :key="index" 
-					:name="dio.isRemind"
-					>
-					{{dio.name}}
-				</u-radio>
-			</u-radio-group>
-		</view>
-	
-	</view>
-	
-		<view  v-if="!getPointBl"  style="text-align:center;margin-top: 40px;" >		
-			 <img src="static/img/getPointError.png" style="width: 50%;" alt="" >
-			 <view>打开手机定位功能,为您查询附近的站点</view>
-			 <u-button :custom-style="btn" size="medium" shape="circle" plain @click="getPoint(true)"  >刷新</u-button>
-		</view>
-		
-		<view  v-if="isLoading&&getPointBl&&siteList.length==0" style="text-align:center;margin-top: 40px;" >
-			<img src="static/img/null.png" style="width: 50%;" alt="" >
-			<view>附近暂无站点信息</view>
-			<u-button  :custom-style="btn" size="medium" shape="circle" plain   @click="getPoint(true)" >刷新</u-button>
-		</view>
-		<view class="index-floor"  v-for="item,index in siteList" :key="index">
-			<view class="title" @click="gotoLineList(item.stationId)" >
-				<view class="title-site">
-					<u-icon name="zhanpai" custom-prefix="custom-icon" size="40" color="#1677ff"></u-icon>
-					<span>{{item.stationName}}</span>
-				</view>
-				<u-icon name="arrow-right" color="#999" size="28"></u-icon>
-			</view>
-			<view class="content">
-				<view class="route">
-					<view class="route-item" v-for="li,i in item.nearbyShiftDTOList" :key="i" @click="gotoLine(li,item.stationId)">
-						<view class="route-text">
-							<h4>{{li.routeName}}</h4>
-							<p>开往:{{li.endStationName}} {{li.currentStationName&&li.des!='等待发车'?'当前:'+li.currentStationName:''}}</p>
-						</view>
-						<view class="route-gap" >
-							<view class="route-gap stop">
-								<span>{{li.des?li.des:"等待发车"}}</span>
-								<u-icon name="arrow-right" color="#999" size="28"></u-icon>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import api from './index.js'
-	export default   api
-	
-</script>
-
-<style>
-	page{background-color: #f7f7f7;}
-</style>
-<style scoped lang="scss">
-	.btn{
-		border-color: #1677FF ;
-	}
-	.slot-wrap {
-		display: flex;
-		align-items: center;
-		flex: 1;
-	}
-	.navbar-right {
-		display: flex;
-		margin-right: 20rpx;
-	}
-	.navbar-left{
-		display: flex;
-		align-items: center;
-		margin-left: 20rpx;
-		span{
-			margin-right: 6rpx;
-			font-size: 14px;
-		}
-	}
-	.search-wrap {
-		margin: 0 20rpx;
-		flex: 1;
-	}
-	.banner{
-		padding: 20rpx;
-		background-color: #fff;
-	}
-	.slot-content{
-		background-color: #fff;
-	}
-	.index-floor{
-		margin: 20rpx;
-		background-color: #fff;
-		border-radius: 20rpx;
-		.title{
-			padding: 20rpx;
-			border-bottom: 1px solid #f7f7f7;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			.title-site{
-				display: flex;
-				align-items: center;
-			}
-			span{
-				margin-left: 10rpx;
-				font-size: 16px;
-				font-weight: bold;
-			}
-		}
-		.text{
-			padding: 20rpx;
-			border-bottom: 1px solid #f7f7f7;
-			display: flex;
-			align-items: center;
-			span{
-				margin-left: 10rpx;
-				font-size: 12px;
+<template>
+	<view>
+ 		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
 			}
-		}
-	}
-	.route{
-		margin:0 20rpx;
-	}
-	.route-item{
-		padding:  20rpx 0;
-		border-bottom: 1px solid #f7f7f7;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		&:last-child{
-			border: none;
-		}
-		h4{
-			font-size: 32rpx;
-		}
-		p{
-			margin-top: 6rpx;
-			color:#999;
-		}
-	}
-	.route-gap{
-		span{
-			font-size: 32rpx;
-			font-weight: bold;
-			margin-right: 10rpx;
-			color:#1677ff;
-		}
-		&.stop{
-			span{color:#ff731d}
-		}
-	}
-	.remind{
-		background-color: #1677ff;
-		margin: 10px;
-		padding: 10px;
-		border-radius: 10px;
-		h3{color:#fff}
-		p{color:#fff;margin-top: 10px;margin-bottom: 5px;}
-	
-	}
-	.remind-radio{
-		color:#fff;
-		/deep/.u-radio__label{
-			color:#fff;
-		}
-		/deep/.u-icon__icon{
-			color:#1677ff!important
-		}
-	}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
 </style>

+ 0 - 95
pages/index/sitePage.js

@@ -1,95 +0,0 @@
-
-import * as API from '@/apis/index.js'
-
- import Carmap from '@/components/Carmap.vue'
-export default {
-		data() {
-			return {
-					mapopen:false,
-				isReady:false,
-				id:'',
-				longitude: '',
-				latitude: '', 
-				nearbyStationInfo:{
-					nearbyShiftDTOList:[]
-				}
-			}
-		},
-		components: {
-			Carmap
-		},
-		onLoad(op){
-			this.longitude=op.longitude;
-			this.latitude=op.latitude;
-			this.id=op.id;
-		},
-		methods: {
-			mapdown(){
-				var obj={
-					longitude:this.longitude,
-					latitude:this.latitude,
-				}
-				var obj2={
-					longitude:this.nearbyStationInfo.longitude,
-					latitude:this.nearbyStationInfo.latitude,
-				}
-				
-				this.$refs.amap.setPerson(obj);
-				this.$refs.amap.setSite(obj2);
-			},
-			gotoLine(item,downid){
-				uni.navigateTo({
-					url:'/pages/route/index?id='+item.routeId+"&upid="+item.startStationId+"&downid="+downid
-				})
-				
-			},
-			mapopenBtn(){
-				this.mapopen=!this.mapopen;
-				if(this.mapopen){
-					this.$refs.amap.setMyStyle("width: 100%; height: 340px;")
-				}else{
-					this.$refs.amap.setMyStyle("width: 100%; height: 140px;")
-					
-				}
-			},
-			gotoLine(item,downid){
-				uni.navigateTo({
-					url:'/pages/route/index?id='+item.routeId+"&upid="+item.startStationId+"&downid="+downid
-				})
-				
-			},
-		 
-			getNearbyStationInfo() {
-				var obj={
-					longitude:this.longitude,
-					latitude:this.latitude,
-					id:this.id,
-				}
-			
-				this.$refs.common.showLoading();
-				
-				API.nearbyStationInfo(obj).then((res) => {
-					this.nearbyStationInfo=res.data;
-					
-					this.$refs.common.showLoading(false);
-				}).catch(error => {
-					this.$refs.common.showLoading(false,error);
-					
-				})
-			},
-		
-		 
-		 
-		},onReady(){
-		
-			this.getNearbyStationInfo();
-			this.isReady=true;
-			this.$refs.amap.init();
-		},onShow(){
-			if(this.isReady){
-					this.getNearbyStationInfo();
-			}
-			
-			
-		},
-	}

+ 0 - 109
pages/index/sitePage.vue

@@ -1,109 +0,0 @@
-<template>
-	<view>
-		<car-common     ref="common"></car-common>
-		<u-navbar title="站点主页"  >
-			<view class="slot-wrap"></view>
-			<view class="navbar-right" @click="mapopenBtn"  >
-				<u-icon name="plus-circle" v-if="!mapopen" color="#999" size="28"></u-icon>
-				<span v-if="!mapopen">放大地图</span>
-				<u-icon name="minus-circle" v-if="mapopen" color="#999" size="28"></u-icon>
-				<span v-if="mapopen">缩小地图</span>
-			</view>
-		</u-navbar>
-		<carmap ref="amap" @onload="mapdown"></carmap>
-		<view class="sitePage-currentSite">
-			<u-icon name="zhanpai" custom-prefix="custom-icon" size="40" color="#1677ff"></u-icon>
-			<span>{{nearbyStationInfo.stationName}}</span>
-			<p>距离{{nearbyStationInfo.distance}}米</p>
-		</view> 
-		<view class="sitePage-route">
-			<view class="route-item" v-for="li,i in nearbyStationInfo.nearbyShiftDTOList " :key="i" @click="gotoLine(li,nearbyStationInfo.stationId)">
-				<view class="route-text">
-					<h4>{{li.routeName}}</h4>
-					<p>开往:{{li.endStationName}} {{li.currentStationName&&li.des!='等待发车'?'当前:'+li.currentStationName:''}}</p>
-				</view>
-				<view class="route-gap" >
-					<view class="route-gap stop">
-						<span>{{li.des?li.des:"等待发车"}}</span>
-						<u-icon name="arrow-right" color="#999" size="28"></u-icon>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import api from './sitePage.js'
-	export default   api
-</script>
-
-<style>
-	page{
-		background-color: #f7f7f7;
-	}
-</style>
-<style scoped lang="scss">
-	.sitePage-currentSite{
-		background-color: #fff;
-		height: 50px;
-		display: flex;
-		padding: 0 15px;
-		align-items: center;
-		span{
-			font-size: 18px;
-			margin-left: 10px;
-			font-weight: bold;
-		}
-		p{
-			color:#999;
-			margin-left: 10px;
-		}
-	}
-	.sitePage-route{
-		margin: 10px;
-		.route-item{
-			padding:  20rpx;
-			background-color: #fff;
-			border-bottom: 1px solid #f7f7f7;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			&:last-child{
-				border: none;
-			}
-			h4{
-				font-size: 32rpx;
-			}
-			p{
-				margin-top: 6rpx;
-				color:#999;
-			}
-		}
-		.route-gap{
-			span{
-				font-size: 32rpx;
-				font-weight: bold;
-				margin-right: 10rpx;
-				color:#1677ff;
-			}
-			&.stop{
-				span{color:#ff731d}
-			}
-		}
-	}	
-	
-	.navbar-right {
-				display: flex;
-				margin-right: 20rpx;
-				span{
-					color:rgb(96, 98, 102);
-					margin-left: 3px;
-				}
-			}
-			.slot-wrap {
-					display: flex;
-					align-items: center;
-					flex: 1;
-				}
-</style>

+ 16 - 0
pages/job/index/companyInfo/companyInfo.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/index/companyInfo/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 27 - 0
pages/job/index/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/index/index.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/index/recruitInfo/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/index/recruitInfo/recruitInfo.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/newsIndex/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 27 - 0
pages/job/newsIndex/newsEntry/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/newsIndex/newsEntry/newsEntry.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 16 - 0
pages/job/newsIndex/newsIndex.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/newsIndex/newsInvitationBefore/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/newsIndex/newsInvitationBefore/newsInvitationBefore.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/newsIndex/newsInvitationPhone/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/newsIndex/newsInvitationPhone/newsInvitationPhone.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/newsIndex/newsList/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/newsIndex/newsList/newsList.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/newsIndex/newsRecommend/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/newsIndex/newsRecommend/newsRecommend.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 16 - 0
pages/job/personal/about/about.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/personal/about/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 27 - 0
pages/job/personal/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/personal/install/account/account.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/personal/install/account/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 27 - 0
pages/job/personal/install/account/passwordA/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/personal/install/account/passwordA/passwordA.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/personal/install/account/passwordB/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/personal/install/account/passwordB/passwordB.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/personal/install/account/passwordC/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/personal/install/account/passwordC/passwordC.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/personal/install/account/phoneA/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/personal/install/account/phoneA/phoneA.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/personal/install/account/phoneB/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/personal/install/account/phoneB/phoneB.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/personal/install/account/phoneC/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/personal/install/account/phoneC/phoneC.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/personal/install/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

+ 16 - 0
pages/job/personal/install/install.vue

@@ -0,0 +1,16 @@
+<template>
+	<view>
+		 <my-common     ref="common"></my-common>
+		 
+	</view>
+</template>
+
+<script>
+	import api from './index.js'
+	export default api;
+</script>
+
+ 
+<style scoped lang="scss">
+	 
+</style>

+ 27 - 0
pages/job/personal/install/myInfo/index.js

@@ -0,0 +1,27 @@
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/index.js'
+
+export default {
+		data() {
+			return {
+				isReady:false,
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			 
+			
+		},onReady(){ 
+			
+			this.isReady=true;
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
+	}

Some files were not shown because too many files changed in this diff