pages/login/step1.vue

 	pages/login/step2.vue
 	pages/login/step3.vue
 	pages/login/step4.vue

README.md

@@ -1,4 +1,4 @@
-#   智能充电系统
+#   荆州工会鹊桥
 发行方式， uniapp  点击”发行“ -”自定义发行“   prod 正式环境| test 测试环境
 
 运行方式  uniapp正常运行方式
@@ -67,4 +67,19 @@ u-loadmore//加载更多
 
 	uni.showLoading({
 					    title: '加载中'
-					});
+					});
+					
+图片转base64				
+[](https://www.sojson.com/image2base64.html)
+
+
+测试环境地址：
+https://charging.xiaoxinda.com/making-friends-server/doc.html
+
+测试数据库：
+47.111.136.126:8100/ jz_makingfriends
+
+构建地址：
+http://119.36.146.59:9090/job/making-friends-server/
+
+jenkins账户密码：admin/jpsoft

apis/login.js

@@ -1,5 +1,6 @@
  import requestWhite from '../utils/requestWhite.js';
 import Qs from 'qs';
+import request from '../utils/request.js';
 
  
 export function findByOpenId(data) {
@@ -11,40 +12,58 @@ export function findByOpenId(data) {
 	})
 }
 
-export function validateCode(data) {
-	 
+export function logout(data) {
+	var url='/mobile/regUser/logout';
 	return requestWhite({
-		method: 'post',
-		data:data ,
-		url: '/mobile/regUser/validateCode'
+		method: 'get',
+		data: data,
+		url: url
 	})
-} 
+}
 
-export function getVerifyCode(tel) {
+export function getVerifyCode(telephone) {
 	 
 	return requestWhite({
 		method: 'post',
 		data:{
-			telephone:tel
+			telephone:telephone
 		} ,
 		url: '/mobile/regUser/getVerifyCode'
 	})
 } 
 
-export function passwordLogin(data) {
+export function login(data) {
 	 
-	 var url=""
-	 if(data.form=="job"){
-	 	url='/mobile/jobUserApi/passwordLogin';
-	 }else if(data.form=="hr"){
-	 	url='/mobile/sysUserApi/passwordLogin';
-	 }else{
-	 	return 
-	 }
+	return requestWhite({
+		method: 'post',
+		data: data,
+		url: '/mobile/regUser/login'
+	})
+} 
+
+export function register(data) {
 	 
 	return requestWhite({
 		method: 'post',
-		data:data ,
-		url: url
+		data: data,
+		url: '/mobile/regUser/register'
 	})
-} 
+} 
+
+export function changePhone(data) {
+	 
+	return request({
+		method: 'post',
+		data: data,
+		url: '/mobile/regUser/changePhone'
+	})
+} 
+
+export function orgList(data) {
+	 
+	return requestWhite({
+		method: 'post',
+		data: data,
+		url: '/mobile/regUser/orgList'
+	})
+} 

apis/news.js

@@ -0,0 +1,28 @@
+import request from '../utils/request.js';
+import Qs from 'qs';
+
+
+export function newsTypeList(data) {
+	return request({
+		method: 'post',
+		data: Qs.stringify(data),
+		url: '/mobile/news/newsTypeList'
+	})
+}
+
+export function newscontent(data) {
+	return request({
+		method: 'post',
+		data: Qs.stringify(data),
+		url: '/mobile/news/content'
+	})
+}
+
+export function newsdetail(data) {
+	
+	return request({
+		method: 'post',
+		data: Qs.stringify(data),
+		url: '/mobile/news/detail'
+	})
+}

bobo-router/index.js

@@ -1,5 +1,5 @@
  
-// import  carhelp from '@/utils/mixin.js'
+// import  carhelp from '@/utils/mixin.js'
 
 import Vue from 'vue'
 import uniCrazyRouter from "uni-crazy-router";
@@ -10,29 +10,29 @@ Vue.use(uniCrazyRouter)
 
 uniCrazyRouter.beforeEach(async (to, from, next) => {
 
-
-	routerBeforeEach(to, from, next);
+
+	routerBeforeEach(to, from, next);
 	
 })
 
 uniCrazyRouter.afterEach((to, from) => {
 	// 逻辑代码
-	console.log("afterEach")
-	if(process.car.NODE_ENV=='dev'||process.car.NODE_ENV=='test'){
-		    uni.setNavigationBarTitle({
-		       		title:'智能充电系统('+process.car.NODE_ENV+')',
-		    						
-		    }) 
-		}
+	console.log("afterEach")
+	if(process.car.NODE_ENV=='dev'||process.car.NODE_ENV=='test'){
+		    uni.setNavigationBarTitle({
+		       		title:'荆州工会鹊桥('+process.car.NODE_ENV+')',
+		    						
+		    }) 
+		}
 	
 })
 
 uniCrazyRouter['on' + 'Error']((to, from) => {
 	// 逻辑代码
-	console.log("Error+start")
-	console.log(to)
-	console.log(from)
-	console.log("Error+end")
+	console.log("Error+start")
+	console.log(to)
+	console.log(from)
+	console.log("Error+end")
 	
 })
 
@@ -44,10 +44,10 @@ Vue.use(Router)
 const router = new Router()
 
 // 路由全局拦截器 在这里处理登录、授权等相关操作
-router.beforeEach(function(to, from, next) {
+router.beforeEach(function(to, from, next) {
 	
-	console.log('前置守卫')
-	routerBeforeEach(to, from, next);
+	console.log('前置守卫')
+	routerBeforeEach(to, from, next);
 
 })
  
@@ -65,4 +65,4 @@ router.onError(function(e) {
 	console.log('错误：', e.message || '路由跳转失败')
 })
 
-export default router
+export default router

components/Tabbar.vue

@@ -1,112 +0,0 @@
-<template >
-	<view>
-		<u-tabbar v-model="myCurrent" :list="tabbarList" 
-		:before-switch="beforeSwitch"
-		:mid-button="true" active-color="#1677ff"></u-tabbar>
-		
-	</view>
-</template>
-
-<script>
- 	
- 	export default {
-		name:"tabbarJob",
-		props:{
-			current: 0
-			
-		},
-		data() {
-			return {
-				activeColor:"#5098FF",
-				oldindex:this.current,
-				 myCurrent:this.current,
-				 tabbarList: [{
-				 		iconPath: "motuoche-diandongche",
-				 		selectedIconPath: "motuoche-diandongche",
-				 		text: '充电中',
-				 		count: 0,
-				 		isDot: true,
-				 		customIcon: true,
-						pagePath2:"/pages/index/index?k=1",
-						
-				 	},
-				 	{
-				 		iconPath: "/static/img/min_button_select.png",
-				 		selectedIconPath: "/static/img/min_button_select.png",
-				 		text: '充电',
-				 		midButton: true,
-				 		customIcon: true,
-						pagePath2:"/pages/charge/index",
-				 	},
-				 	{
-				 		iconPath: "31wode",
-				 		selectedIconPath: "31wode",
-				 		text: '我的',
-				 		count: 0,
-				 		isDot: false,
-				 		customIcon: true,
-						pagePath2:"/pages/user/index",
-				 	},
-				 ],
-			};
-			
-		},methods:{
-			beforeSwitch(index){
-				var  tabbarList= [{
-				 		iconPath: "motuoche-diandongche",
-				 		selectedIconPath: "motuoche-diandongche",
-				 		text: '充电中',
-				 		count: 0,
-				 		isDot: true,
-				 		customIcon: true,
-						pagePath2:"/pages/index/index?k=1",
-						
-				 	},
-				 	{
-				 		iconPath: "/static/img/min_button_select.png",
-				 		selectedIconPath: "/static/img/min_button_select.png",
-				 		text: '充电',
-				 		midButton: true,
-				 		customIcon: true,
-						pagePath2:"/pages/charge/index",
-				 	},
-				 	{
-				 		iconPath: "31wode",
-				 		selectedIconPath: "31wode",
-				 		text: '我的',
-				 		count: 0,
-				 		isDot: false,
-				 		customIcon: true,
-						pagePath2:"/pages/user/index",
-				 	},
-				 ]
-				
-				if(index==this.current){
-					return false
-				}
-				//console.log(this.tabbarList)
-				var url =tabbarList[index].pagePath2;
-				
-				uni.navigateTo({
-					url: url
-				})
-				if(index==1){
-					this.myCurrent=this.oldindex;
-					return false;
-				}else{
-					return true;
-				}
-				
-			},
-			
-		},mounted(){
-				 console.log(this.tabbarList)
-		},destroyed(){
-		}
-		
-	}
-</script>
-
-<style>
-	 
-</style>

manifest.json

@@ -79,7 +79,7 @@
                 "enable" : true
             }
         },
-        "title" : "智能充电系统",
+        "title" : "荆州工会鹊桥",
         "router" : {
             "base" : "./"
         }

package-lock.json

@@ -1143,6 +1143,7 @@
    "version": "7.17.9",
    "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.17.9.tgz",
    "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
+   "dev": true,
    "requires": {
     "regenerator-runtime": "^0.13.4"
    }
@@ -2061,6 +2062,44 @@
      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
      "dev": true
     },
+    "ansi-styles": {
+     "version": "4.3.0",
+     "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+     "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "color-convert": "^2.0.1"
+     }
+    },
+    "chalk": {
+     "version": "4.1.2",
+     "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+     "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "ansi-styles": "^4.1.0",
+      "supports-color": "^7.1.0"
+     }
+    },
+    "color-convert": {
+     "version": "2.0.1",
+     "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "color-name": "~1.1.4"
+     }
+    },
+    "color-name": {
+     "version": "1.1.4",
+     "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+     "dev": true,
+     "optional": true
+    },
     "fs-extra": {
      "version": "7.0.1",
      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-7.0.1.tgz",
@@ -2072,6 +2111,13 @@
       "universalify": "^0.1.0"
      }
     },
+    "has-flag": {
+     "version": "4.0.0",
+     "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+     "dev": true,
+     "optional": true
+    },
     "jsonfile": {
      "version": "4.0.0",
      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -2089,6 +2135,28 @@
      "requires": {
       "minipass": "^3.1.1"
      }
+    },
+    "supports-color": {
+     "version": "7.2.0",
+     "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+     "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "has-flag": "^4.0.0"
+     }
+    },
+    "vue-loader-v16": {
+     "version": "npm:vue-loader@16.8.3",
+     "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+     "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "chalk": "^4.1.0",
+      "hash-sum": "^2.0.0",
+      "loader-utils": "^2.0.0"
+     }
     }
    }
   },
@@ -4066,11 +4134,6 @@
    "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
    "dev": true
   },
-  "copy-text-to-clipboard": {
-   "version": "3.0.1",
-   "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
-   "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q=="
-  },
   "copy-webpack-plugin": {
    "version": "5.1.2",
    "resolved": "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz",
@@ -4261,7 +4324,8 @@
   "core-js": {
    "version": "3.21.1",
    "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
-   "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
+   "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
+   "dev": true
   },
   "core-js-compat": {
    "version": "3.21.1",
@@ -8676,11 +8740,6 @@
     "minimatch": "^3.0.0"
    }
   },
-  "mutation-observer": {
-   "version": "1.0.3",
-   "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
-   "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
-  },
   "mute-stream": {
    "version": "0.0.7",
    "resolved": "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.7.tgz",
@@ -10546,7 +10605,8 @@
   "regenerator-runtime": {
    "version": "0.13.9",
    "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-   "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+   "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+   "dev": true
   },
   "regenerator-transform": {
    "version": "0.15.0",
@@ -12917,17 +12977,6 @@
    "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
    "dev": true
   },
-  "vconsole": {
-   "version": "3.14.5",
-   "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.14.5.tgz",
-   "integrity": "sha512-ZfBsaRloRU7eJXH2z2YiNSF5Yb7AblwdPx0c8YcT/RO0ShqfUGrDqRuAmysfLUO+oJ8fC+ZPTgB4r5+rr6msQw==",
-   "requires": {
-    "@babel/runtime": "^7.17.2",
-    "copy-text-to-clipboard": "^3.0.1",
-    "core-js": "^3.11.0",
-    "mutation-observer": "^1.0.3"
-   }
-  },
   "vendors": {
    "version": "1.0.4",
    "resolved": "https://registry.npmmirror.com/vendors/-/vendors-1.0.4.tgz",
@@ -13063,75 +13112,6 @@
     }
    }
   },
-  "vue-loader-v16": {
-   "version": "npm:vue-loader@16.8.3",
-   "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-   "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-   "dev": true,
-   "optional": true,
-   "requires": {
-    "chalk": "^4.1.0",
-    "hash-sum": "^2.0.0",
-    "loader-utils": "^2.0.0"
-   },
-   "dependencies": {
-    "ansi-styles": {
-     "version": "4.3.0",
-     "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-     "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "color-convert": "^2.0.1"
-     }
-    },
-    "chalk": {
-     "version": "4.1.2",
-     "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-     "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "ansi-styles": "^4.1.0",
-      "supports-color": "^7.1.0"
-     }
-    },
-    "color-convert": {
-     "version": "2.0.1",
-     "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "color-name": "~1.1.4"
-     }
-    },
-    "color-name": {
-     "version": "1.1.4",
-     "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-     "dev": true,
-     "optional": true
-    },
-    "has-flag": {
-     "version": "4.0.0",
-     "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-     "dev": true,
-     "optional": true
-    },
-    "supports-color": {
-     "version": "7.2.0",
-     "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-     "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "has-flag": "^4.0.0"
-     }
-    }
-   }
-  },
   "vue-style-loader": {
    "version": "4.1.3",
    "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz",

package.json

@@ -9,7 +9,7 @@
   "compression-webpack-plugin": "^8.0.1",
   "uni-crazy-router": "0.0.31",
   "uni-simple-router": "^2.0.1",
-  "uview-ui": "^2.0.30",
+  "uview-ui": "^1.8.4",
   "vue-cli": "^2.9.6",
   "vue-cropper": "^0.5.6",
   "vuex": "^3.6.2",

pages.json

@@ -3,13 +3,7 @@
 			"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 		},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages	
-		{
-			"name":"1.填写基础资料",
-			"path": "pages/login/step1",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
+		
 		
 		{
 			"name":"首页",
@@ -96,13 +90,13 @@
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 			}
 		},
-		/*{
+		{
 			"name":"1.填写基础资料",
 			"path": "pages/login/step1",
 			"style": {
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 			}
-		},*/
+		},
 		{
 			"name":"2.完善个人信息",
 			"path": "pages/login/step2",
@@ -177,15 +171,20 @@
 			}
 		]
 	},
-	"condition" : { //模式配置，仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "步骤1", //模式名称
-				"path": "pages/login/step1", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "登录", //模式名称
+				"path": "pages/login/index", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			},
+			{
+				"name": "新闻", //模式名称
+				"path": "pages/news/index", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
 	}
   
 }

pages/index/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :is-back="false"></u-navbar>
 		<view class="home-head">
 			<view class="homeTab">
 				<u-tabs :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>

pages/login/agreement.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar></u-navbar>
 		<view class="article">
 			<view class="article-tit">
 				“荆州工会鹊桥”会员注册协议

pages/login/search.vue

@@ -1,60 +1,123 @@
 <template>
 	<view>
+		<u-navbar back-text="查找工会"></u-navbar>
 		<view class="search">
-			<u-search placeholder="输入关键字查询工会" v-model="keyword" :action-style="actionStyle"></u-search>
+			<u-search placeholder="输入关键字查询工会" v-model="keyword" :action-style="actionStyle" @custom="searchQrg" @search="searchQrg"></u-search>
 		</view>
-		<view class="searchList">
-			<view class="searchList-item">
-				湖北荆鹏软件开发有限公司工会
-			</view>
-			<view class="searchList-item">
-				湖北荆鹏软件开发有限公司工会
-			</view>
-			<view class="searchList-item">
-				湖北荆鹏软件开发有限公司工会
-			</view>
-			<view class="searchList-item">
-				湖北荆鹏软件开发有限公司工会
-			</view>
-			<view class="searchList-item">
-				湖北荆鹏软件开发有限公司工会
-			</view>
-
+		<view class="searchList" v-if="orgResult.length > 0">		
+			<list>
+				<cell v-for="(item, index) in orgResult" :key="item.id">
+					<view class="searchList-item">
+						<text @click="getRegister(item)">{{item.name}}</text>
+					</view>
+				</cell>
+			</list>		
 			<u-divider color="#B6BDC3" style="margin-top:20px;">已经到底了</u-divider>
 		</view>
+		<view class="jpDefault" v-else>
+			<u-image width="179px" height="126px" src="/static/img/default1.png"></u-image>
+			<p>没有匹配的搜索结果</p>
+		</view>
 	</view>
 </template>
 
 <script>
+	import * as loginApi from '@/apis/login.js'
+
 	export default {
 		data() {
 			return {
 				keyword: '',
-				actionStyle:{
+				pageIndex: 1,
+				pageSize: 100,
+				orgResult: [],
+				actionStyle: {
 					background: '#FF5E5E',
-					color:'#ffffff',
-					padding:'5px 0',
-					width:'60px',
-					borderRadius:'15px',
+					color: '#ffffff',
+					padding: '5px 0',
+					width: '60px',
+					borderRadius: '15px',
 				},
 			}
-			methods: {
-
+		},
+		methods: {
+			getRegister(item) {
+				this.carhelp.set("selectitem",item)
+				uni.navigateBack({
+					url: '/pages/login/register'
+				})
+			},
+			getList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				loginApi.orgList({
+					pageIndex: this.pageIndex,
+					pageSize: this.pageSize,
+					orgName: this.keyword
+				}).then((response) => {
+					var jsonData = response.data.data;
+					console.log(jsonData);
+					this.orgResult = jsonData;
+					uni.hideLoading()
+				})
+				.catch((error) => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			searchQrg() {			
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				loginApi.orgList({
+					pageIndex: this.pageIndex,
+					pageSize: this.pageSize,
+					orgName: this.keyword
+				}).then((response) => {
+					var jsonData = response.data.data;
+					this.orgResult = jsonData;
+					uni.hideLoading();			
+				})
+				.catch((error) => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			onReady() {
+				this.getList();
 			}
-
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.search{
-		padding:10px 15px;
+	.search {
+		padding: 10px 15px;
 	}
-	.searchList{
-		padding:0 15px;
-		.searchList-item{
+
+	.searchList {
+		padding: 0 15px;
+
+		.searchList-item {
 			border-bottom: 1px solid #E5E7EA;
-			padding:15px 0; 
+			padding: 15px 0;
+		}
+	}
+	
+	.jpDefault{
+		padding-top:150px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		p{
+			color: #A69F9F;
+			font-size: 16px;
+			margin-top: 12px;
 		}
 	}
 </style>

pages/login/searchNone.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar back-text="查找工会"></u-navbar>
 		<view class="search">
 			<u-search placeholder="输入关键字查询工会" v-model="keyword" :action-style="actionStyle"></u-search>
 		</view>

pages/login/step1.vue

@@ -1,11 +1,33 @@
 <template>
 	<view>
+		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
 			<view class="jpLogin-title">
 				<h2>填写基础信息<span>1</span>/4</h2>
 				<p>交友第一步，简单介绍下自己吧~</p>
 			</view>
+			
 			<view class="jpLogin-main">
+				<view class="form-tit">
+					<span>*</span>
+					<p>为必填项，著名保密箱的为不对外公开信息</p>
+				</view>
+				<view class="jpLogin-sex">
+					<view class="jpLogin-sex-item">
+						<u-image class="newsList-img" src="/static/img/sexMan.png" height="200" width="200" border-radius="10"></u-image>
+						<!-- <u-image class="newsList-img" src="/static/img/sexMan2.png" height="200" width="200" border-radius="10"></u-image> -->
+					</view>
+					<view class="jpLogin-sex-item">
+						<!-- <u-image class="newsList-img" src="/static/img/sexWoman.png" height="200" width="200" border-radius="10"></u-image> -->
+						<u-image class="newsList-img" src="/static/img/sexWoman2.png" height="200" width="200" border-radius="10"></u-image>
+					</view>
+				</view>
+				<view class="form-tit">
+					<p>注册完成，你的性别就不能修改了哦~</p>
+				</view>
+				<view class="form-tit" style="margin-top: 36px;">
+					<p>设置生日、身高和体重</p>
+				</view>
 				<u-form :model="form" ref="uForm">
 					<view class="jpLogin-input">
 						<u-form-item required="true"><u-input v-model="form.birthday" type="select" placeholder="请选择生日" @click="birthdayChange"/>
@@ -30,9 +52,7 @@
 				<view class="step-btn" @click="goHome">跳过</view>
 			</view>
 		</view>
-		<uni-calendar ref="calendar" class="uni-calendar--hook" :clear-date="true" :date="info.date" :insert="info.insert" :lunar="info.lunar" :startDate="info.startDate"
-			 :endDate="info.endDate" :range="info.range" @confirm="confirm" @close="close"/>
-		<mpvue-date-picker  themeColor="#007AFF" ref="mpvueDatePicker" :pickerValueDefault="agePickerValueDefault" @onConfirm="onDateConfirm"></mpvue-date-picker>
+ 		<mpvue-date-picker  themeColor="#007AFF" ref="mpvueDatePicker" :pickerValueDefault="agePickerValueDefault" @onConfirm="onDateConfirm"></mpvue-date-picker>
 		 
 	</view>
 </template>
@@ -65,10 +85,9 @@
 		}
 	}
 	import mpvueDatePicker from "../../components/mpvue-datepicker/mpvue-datepicker.vue"
-	import uniCalendar from "../../components/uni-calendar/uni-calendar.vue";
+ 
 	export default {
-		components:{
-			uniCalendar,
+		components:{ 
 			mpvueDatePicker
 		},
 		data() {
@@ -84,7 +103,7 @@
 				value:'0',
 				customStyle: {
 					background: '#FF5E5E'
-				},
+				}, 
 				showCalendar: false,
 				info: {
 					lunar: true,
@@ -97,7 +116,10 @@
 				height_ranges:[],
 				weight_ranges:[],
 				height_ranges_by_names:[],
-				weight_ranges_by_names:[],
+				weight_ranges_by_names:[], 
+				background:{
+					background: 'none'
+				} 
 			}
 		},		
 		onReady() {
@@ -209,11 +231,31 @@
 </script>
 
 <style lang="scss" scoped>
+	.jpLogin-sex{
+		display: flex;
+		margin-bottom: 5px;
+		.jpLogin-sex-item{
+			margin-right: 15px;
+		}
+	}
+	.form-tit{
+		display: flex;
+		align-items: center;
+		span{
+			color:#EE3138 ;
+			
+		}
+		p{
+			color: #999;
+			margin-bottom: 8px;
+		}
+	}
 	.jpLogin {
 		background: url(/static/img/loginBg.png) top center no-repeat;
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		margin-top: -44px;
 	}
 	.step-btn{
 		text-align: center;

pages/login/step2.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
 			<view class="jpLogin-title">
 				<h2>完善个人信息<span>2</span>/4</h2>
@@ -51,14 +52,35 @@
 						<u-select v-model="show_children" mode="single-column" :list="children_statuses_by_names" @confirm="childrenConfirm"></u-select>						
 					</view>
 					
-					<view class="form-tit">
+					<view class="form-tit" style="margin-top: 36px;">
 						自我评价
 					</view>
 					<view class="jpLogin-textarea">
-						<u-form-item>
+						<u-form-item> 
 							<u-input v-model="form.self_assess" type="textarea" placeholder="" />
+ 
 						</u-form-item>
 					</view>
+					
+					<view class="form-tit" style="margin-top: 36px;">
+						选中我的兴趣爱好（可多选）
+					</view>
+					<view class="jpLogin-interest">
+						<view class="interest-item active">摄影</view>
+						<view class="interest-item">烹饪</view>
+						<view class="interest-item">健身</view>
+						<view class="interest-item active">看电影</view>
+						<view class="interest-item">旅行</view>
+						<view class="interest-item">打游戏</view>
+						<view class="interest-item">修身养性</view>
+						<view class="interest-item">摄影</view>
+						<view class="interest-item">烹饪</view>
+						<view class="interest-item">健身</view>
+						<view class="interest-item">看电影</view>
+						<view class="interest-item">旅行</view>
+						<view class="interest-item">打游戏</view>
+						<view class="interest-item">修身养性</view>
+					</view>
 				</u-form>
 			</view>
 			<view style="margin-top: 60px;">
@@ -106,7 +128,7 @@
 				value:'0',
 				customStyle: {
 					background: '#FF5E5E'
-				},
+				}, 
 				salary_ranges_by_names:[],
 				education_ranges_by_names:[],
 				profession_ranges_by_names:[],
@@ -119,9 +141,12 @@
 				show_education:false,
 				show_house:false,
 				show_marriage:false,
-				show_children:false
-			} 
-
+				show_children:false,
+				
+				background:{
+					background: 'none'
+				} 
+			}
 		},
 		onLoad(){
 			_self = this;
@@ -275,9 +300,24 @@
 </script>
 
 <style lang="scss" scoped>
+	.jpLogin-interest{
+		display: flex;
+		flex-wrap: wrap;
+		.interest-item{
+			padding: 4px 10px;
+			background-color: #E5E7EA;
+			border-radius: 4px;
+			margin-right: 10px;
+			margin-bottom: 10px;
+		}
+		.active{
+			background-color: #FFC1BC;
+		}
+	}
 	.form-tit{
 		color: #999;
 		margin-bottom: 8px;
+		
 	}
 	.jpLogin-textarea{
 		background: #fff;
@@ -290,6 +330,7 @@
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		margin-top: -44px;
 	}
 	.step-btn{
 		text-align: center;

pages/login/step3.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
 			<view class="jpLogin-title">
 				<h2>我的择偶标准 <span>3</span>/4</h2>
@@ -39,8 +40,9 @@
 						其他要求
 					</view>
 					<view class="jpLogin-textarea">
-						<u-form-item>
-							<u-input v-model="form.other" type="textarea" placeholder="" />
+						<u-form-item> 
+							<u-input v-model="form.other" type="textarea" height="140" placeholder="" />
+ 
 						</u-form-item>
 					</view>
 				</u-form>
@@ -90,6 +92,9 @@
 				value: '0',
 				customStyle: {
 					background: '#FF5E5E'
+				},
+				background:{
+					background: 'none'
 				}
 			} 
 
@@ -208,6 +213,7 @@
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		margin-top: -44px;
 	}
 
 	.step-btn {

pages/login/step4.vue

@@ -1,12 +1,27 @@
 <template>
 	<view>
+		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
 			<view class="jpLogin-title">
 				<h2>上传您的头像 <span>4</span>/4</h2>
 				<p>选择一张你的优质照片作为头像吧~</p>
 			</view>
 			<view class="jpLogin-main">
-				<u-upload :action="action" :file-list="fileList" ></u-upload>
+				<view class="jpLogin-upload">
+					<u-image class="newsList-img" src="/static/img/head.png" height="320" width="320" border-radius="10"></u-image>
+				</view>
+				<p>点击上传头像</p>
+				<view class="jpLogin-case">
+					<view class="jpLogin-case-item">
+						<u-image class="newsList-img" src="/static/img/user1.jpg" height="170" width="170" border-radius="10"></u-image>
+					</view>
+					<view class="jpLogin-case-item">
+						<u-image class="newsList-img" src="/static/img/user4.jpg" height="170" width="170" border-radius="10"></u-image>
+					</view>
+					<view class="jpLogin-case-item">
+						<u-image class="newsList-img" src="/static/img/user3.jpg" height="170" width="170" border-radius="10"></u-image>
+					</view>
+				</view>
 			</view>
 			<view style="margin-top: 60px;">
 				<u-button type="error" shape="circle" :custom-style="customStyle" @click="formsubmit">确认提交</u-button>
@@ -20,14 +35,17 @@
 	let _self;
 	export default {
 		data() {
-			return {
+			return { 
 				personal_info:{},
 				action: 'http://www.example.com/upload',
 				fileList: [
 					{
 						url: 'http://pics.sc.chinaz.com/files/pic/pic9/201912/hpic1886.jpg',
 					}
-				]
+				],
+				background:{
+					background: 'none'
+				}
 			} 
 		},
 		onLoad(){
@@ -58,7 +76,8 @@
 			},
 			formsubmit(){
 				 
-			}	
+			}	  
+ 
 		}
 	}
 </script>
@@ -69,6 +88,7 @@
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		margin-top: -44px;
 	}
 	.step-btn {
 		text-align: center;
@@ -93,66 +113,25 @@
 
 	.jpLogin-main {
 		margin-top: 40px;
-	}
-
-	.jpLogin-input {
-		height: 48px;
-		background-color: #fff;
-		border: 1px solid #EEDCDC;
-		border-radius: 50px;
-		display: flex;
-		width: 100%;
-		padding: 0 20px;
-		margin-bottom: 20px;
-		.u-form-item{
-			flex: 1;
-		}
-		.jpLogin-icon{
-			font-size: 20px;
-			color:#FFC1C1;
-			margin-right: 20px;
-			position: relative;
-			&:after{
-				content: '';
-				width: 1px;
-				height: 16px;
-				background-color:#E6D6D6;
-				position: absolute;
-				right: -10px;
-				top: 15px;
-			}
+		p{
+			font-size: 16px;
+			color:#958F90;
+			text-align: center;
+			margin: 10px 0 60px;
 		}
 	}
-
-	.jpLogin-link {
+	.jpLogin-case{
 		display: flex;
 		justify-content: space-between;
-		align-items: center;
-		font-size: 14px;
-
-		.jpLogin-link-l {
-			display: flex;
-			align-items: center;
-
-			p {
-				color: #4f4646;
-			}
-		}
-
-		span {
-			color: #1677FF;
-		}
 	}
-	.jpLogin-radio{
-		margin-top: 16px;
-		text-align: center;
+	.jpLogin-upload{
+		border: 1px dashed #FFA199;
+		border-radius: 12px;
+		overflow: hidden;
+		width: 160px;
+		margin: 0 auto;
 		p{
-			font-size: 14px;
-			color: #a0a4b8;
-		}
-		span{
-			color:#ff5e5e;
-			font-size: 14px;
+			margin-top: 5px;
 		}
 	}
 </style>

pages/news/detalis.vue

@@ -2,51 +2,33 @@
 	<view>
 		<view class="article">
 			<view class="article-tit">
-				在常态化疫情防控中促进经济向好发展，培育壮大新的增长点增长极，牢牢把握发展主动权
+				{{detail.title}}
 			</view>
 			<view class="article-row">
-				<view class="article-time">2021-01-20 09:00:00</view>
+				<view class="article-time">{{detail.createTime}}</view>
 				<view class="article-see">
 					<u-icon custom-prefix="custom-icon" name="eye-line"></u-icon>
 					<span>321</span>
 				</view>
 			</view>
-			<view class="article-con">
-				<p>完整的产业体系、广阔的内需市场、丰富的人力资源
-					是经济向好发展的重要条件，具有比较优势的数字技术
-					及新型生产经营模式是经济向好发展的有力支撑。贯彻
-					落实党中央决策部署，就能变压力为动力、化危为机,
-					在常态化疫情防控中促进经济向好发展，培育壮大新的
-					增长点增长极，牢牢把握发展主动权。
-					4月17日召开的中共中央政治局会议指出，今年- -季
-					度极不寻常，突如其来的新冠肺炎疫情对我国经济社会
-					发展带来前所未有的冲击;要在稳的基础上积极进取,
-					在常态化疫情防控中全面推进复工复产达产，恢复正常
-					经济社:会秩序，培育壮大新的增长点增长极，牢牢把握
-					发展主动权。当前，我国疫情防控向好态势进一一步巩
-					固，但国际疫情持续蔓延，防范疫情输入压力不断加
-					大，复工复产和经济社会发展面临新的困难和挑战。我
-					们要按照习近平总书记重要讲话、重要指示精神和党中
-					央决策部署，坚持底线思维，做好较长时间应对外部环
-					境变化的思想准备和工作准备，在常态化疫情防控中全
-					力促进经济向好发展，确保完成决战决胜脱贫攻坚目标
-					任务，全面建成小康社会。
-					</p>
-				<img src="/static/img/user1.jpg" alt="">
+			<view class="article-con" v-html="detail.content" :style="{fontSize:myFontSize+'px'}">
+				 
 			</view>
+			<u-image class="newsList-img" :src="detail.images" mode="widthFix" border-radius="10"></u-image>
+			
 			<view class="article-foot">
 				<view class="u-flex">
-					<view class="article-btn">
+					<view class="article-btn" @click="fontSizeUp1()">
 						<u-icon custom-prefix="custom-icon" name="zoom-in-line"></u-icon>
 						<span>放大</span>
 					</view>
-					<view class="article-btn">
+					<view class="article-btn" @click="fontSizeDown2()">
 						<u-icon custom-prefix="custom-icon" name="zoom-out-line"></u-icon>
 						<span>缩小</span>
 					</view>
 				</view>
 
-				<view class="article-btn">
+				<view class="article-btn" @click="scrollTop()">
 					<u-icon custom-prefix="custom-icon" name="align-top"></u-icon>
 					<span>回顶</span>
 				</view>
@@ -56,15 +38,70 @@
 </template>
 
 <script>
+	import * as API from '@/apis/news.js'
+	
 	export default {
 		data() {
 			return {
-				
+				myFontSize:14,
+				pageTitle: '文章详情',
+				isLoading: false,
+				id: '',
+				detail: {},
 			}
-			methods: {
-
+		
+		},
+		onLoad(op) {
+			
+			this.id =op.id;
+			this.getDetail();
+			var myFontSize=this.carhelp.get("news-info-fontsize")
+			if(myFontSize){
+				this.myFontSize=myFontSize
 			}
-
+			
+		},
+		methods: {
+			fontSizeUp1(){
+				if(this.myFontSize>=28){
+					uni.showToast({
+						title: "当前已为最大字体"
+					})
+					return
+				}
+				this.myFontSize=this.myFontSize+2
+				this.carhelp.set("news-info-fontsize",this.myFontSize)
+			},
+			fontSizeDown2(){
+				if(this.myFontSize<=12){
+					uni.showToast({
+					
+						title: "当前已为最小字体"
+					})
+					return
+				}
+				this.myFontSize=this.myFontSize-2
+				this.carhelp.set("news-info-fontsize",this.myFontSize)
+				
+			},
+			scrollTop(){
+				uni.pageScrollTo({
+					scrollTop: 0,
+						duration: 300
+				})
+			},
+			
+			getDetail() {
+			    API.newsdetail({id:this.id}).then(response => {
+			        this.isLoading = false;
+			        this.detail = response.data;
+				  
+			
+			    }).catch(error => {
+			        this.isLoading = false;
+			        mui.toast(error);
+			    })
+			},
 		}
 	}
 </script>

pages/news/index.vue

@@ -9,30 +9,38 @@
 			<u-swiper :list="wrapList" height="300" border-radius="24"></u-swiper>
 		</view>
 		<view class="newsList">
-			<view class="newsList-item">
+			<view class="newsList-item" 
+				 @click="gotoUrl('pages/news/detalis?id='+item.id)"
+				v-for="(item ,index) in list" :key="item.id" >
 				<view class="newsList-text">
-					<h4 class="u-line-2">还真别说，我幻想过，假如我脑子里有个大容量硬盘，我把维我把维我把维我把维</h4>
-					<p>2021-12-01</p>
+					<h4 class="u-line-2" v-html="item.content">
+						
+					</h4>
+					<p>{{item.createTime}}</p>
 				</view>
-				<u-image class="newsList-img" src="/static/img/user1.jpg" height="150" width="200" border-radius="10"></u-image>
-			</view>
-			<view class="newsList-item">
-				<view class="newsList-text">
-					<h4 class="u-line-2">还真别说，我幻想过，假如我脑子里有个大容量硬盘，我把维我把维我把维我把维</h4>
-					<p>2021-12-01</p>
-				</view>
-				<u-image class="newsList-img" src="/static/img/user1.jpg" height="150" width="200" border-radius="10"></u-image>
+				<u-image class="newsList-img" :src="item.images" height="150" width="200" border-radius="10"></u-image>
 			</view>
+		
 			
-			<u-divider color="#B6BDC3" style="margin-top:20px;">已经到底了</u-divider>
+			<u-divider color="#B6BDC3"  v-if="list.length ==recordsTotal" style="margin-top:20px;">已经到底了</u-divider>
 		</view>
  	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/news.js'
+	
 	export default {
 		data() {
 			return {
+				form:{
+					
+				},
+				newstype:'',
+				typelist: [],
+				pageIndex: 1,
+				recordsTotal: 0,
+				list: [],
 				tabList: [{
 					name: '通知公告'
 				}, {
@@ -55,11 +63,93 @@
 				],
 			}
 		},
+		onReachBottom() {
+			if (this.list.length < this.recordsTotal) {
+				
+				this.myLoadmore();
+			}
+		},
+		
 		methods: {
+			getType() {
+				
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				this.pageIndex = 1;
+			
+				API.newsTypeList().then((res) => {
+					
+					this.tabList = res.data;
+					if(this.tabList.length){
+						this.newstype=this.tabList[0]	
+					}
+					this.getList()
+ 					uni.hideLoading()
+					
+				}).catch(error => {
+					uni.showToast({
+					
+						title: error
+					})
+				})
+			},
+			getList(bl) {
+				
+				if(this.newstype==""){
+					return
+				}
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.list = [];
+					this.pageIndex = 1;
+				}
+				var data = {
+					type:this.newstype.shortName,
+					pageSize:5,
+					pageIndex: this.pageIndex
+				};
+				API.newscontent(data).then((res) => {
+					
+					this.list = [
+						...this.list,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal
+					uni.hideLoading()
+					
+				}).catch(error => {
+					uni.showToast({
+					
+						title: error
+					})
+				})
+			},
+			
+			
+			myLoadmore() {
+					
+				this.pageIndex += 1;
+				this.getList()
+			},
 			change(index) {
 				this.current = index;
+				if(this.tabList.length){
+					this.newstype=this.tabList[index]
+				}
+				this.getList(true)
+			},
+			onReady() {
+			
+				this.getType()
+				
 			}
-		}
+		},
+		
 	}
 </script>
 

static/css/iconfont.css

@@ -1,202 +0,0 @@
-@font-face {
-  font-family: "custom-icon"; /* Project id 3313719 */
-  src: url('//at.alicdn.com/t/font_3313719_gx8aelqfff.woff2?t=1649493232326') format('woff2'),
-       url('//at.alicdn.com/t/font_3313719_gx8aelqfff.woff?t=1649493232326') format('woff'),
-       url('//at.alicdn.com/t/font_3313719_gx8aelqfff.ttf?t=1649493232326') format('truetype');
-}
-
-.custom-icon {
-  font-family: "custom-icon" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.custom-icon-heart-2-fill:before {
-  content: "\e600";
-}
-
-.custom-icon-home-3-fill:before {
-  content: "\e601";
-}
-
-.custom-icon-information-line:before {
-  content: "\e602";
-}
-
-.custom-icon-heart-2-line:before {
-  content: "\e603";
-}
-
-.custom-icon-information-fill:before {
-  content: "\e604";
-}
-
-.custom-icon-map-pin-2-fill:before {
-  content: "\e605";
-}
-
-.custom-icon-filter-2-fill:before {
-  content: "\e606";
-}
-
-.custom-icon-newspaper-line:before {
-  content: "\e607";
-}
-
-.custom-icon-profile-fill:before {
-  content: "\e608";
-}
-
-.custom-icon-folder-user-fill:before {
-  content: "\e609";
-}
-
-.custom-icon-keyboard-box-line:before {
-  content: "\e60a";
-}
-
-.custom-icon-shield-user-fill:before {
-  content: "\e60b";
-}
-
-.custom-icon-lock-password-fill:before {
-  content: "\e60c";
-}
-
-.custom-icon-send-plane-fill:before {
-  content: "\e60d";
-}
-
-.custom-icon-newspaper-fill:before {
-  content: "\e60e";
-}
-
-.custom-icon-home-3-line:before {
-  content: "\e60f";
-}
-
-.custom-icon-men-line:before {
-  content: "\e610";
-}
-
-.custom-icon-spam-3-fill:before {
-  content: "\e611";
-}
-
-.custom-icon-notification-3-fill:before {
-  content: "\e612";
-}
-
-.custom-icon-user-2-fill:before {
-  content: "\e613";
-}
-
-.custom-icon-thumb-up-fill:before {
-  content: "\e614";
-}
-
-.custom-icon-search-line:before {
-  content: "\e615";
-}
-
-.custom-icon-refresh-line:before {
-  content: "\e616";
-}
-
-.custom-icon-user-5-line:before {
-  content: "\e617";
-}
-
-.custom-icon-women-line:before {
-  content: "\e618";
-}
-
-.custom-icon-thumb-up-line:before {
-  content: "\e619";
-}
-
-.custom-icon-align-top:before {
-  content: "\e61a";
-}
-
-.custom-icon-zoom-out-line:before {
-  content: "\e61b";
-}
-
-.custom-icon-zoom-in-line:before {
-  content: "\e61c";
-}
-
-.custom-icon-account-box-line:before {
-  content: "\e61d";
-}
-
-.custom-icon-arrow-drop-down-fill:before {
-  content: "\e61e";
-}
-
-.custom-icon-smartphone-fill:before {
-  content: "\e61f";
-}
-
-.custom-icon-arrow-left-s-line:before {
-  content: "\e620";
-}
-
-.custom-icon-arrow-down-s-line:before {
-  content: "\e621";
-}
-
-.custom-icon-building-fill:before {
-  content: "\e622";
-}
-
-.custom-icon-user-5-fill:before {
-  content: "\e623";
-}
-
-.custom-icon-camera-fill:before {
-  content: "\e624";
-}
-
-.custom-icon-cellphone-fill:before {
-  content: "\e625";
-}
-
-.custom-icon-check-line:before {
-  content: "\e626";
-}
-
-.custom-icon-chat-heart-line:before {
-  content: "\e627";
-}
-
-.custom-icon-close-fill:before {
-  content: "\e628";
-}
-
-.custom-icon-customer-service-fill:before {
-  content: "\e629";
-}
-
-.custom-icon-eye-line:before {
-  content: "\e62a";
-}
-
-.custom-icon-edit-2-line:before {
-  content: "\e62b";
-}
-
-.custom-icon-file-list-3-line:before {
-  content: "\e62c";
-}
-
-.custom-icon-emotion-line:before {
-  content: "\e62d";
-}
-
-.custom-icon-message-3-fill:before {
-  content: "\e62e";
-}

utils/init.js

@@ -6,55 +6,58 @@ import {
 	getWeixinRedirectURI,
 	isWeiXin
 } from '@/utils'
-var checkOpenId = true; //是否需要获取openId
-var openId = carhelp.getOpenId();
+ var openId = carhelp.getOpenId();
 
 var app = {
-	init: function() {
+	init: function() {
+		
+		// #ifdef H5
+			console.log("SIMPLE_RUN 模式，取配置固定openId  可修改SIMPLE_RUN ")
+			carhelp.setOpenId(process.car.openId)
+		// #endif
+		
+		// #ifdef MP-WEIXIN
+			if(process.car.SIMPLE_RUN&& process.env.NODE_ENV === "development" ){
+				console.log("SIMPLE_RUN 模式，取配置固定openId  可修改SIMPLE_RUN ")
+				carhelp.setOpenId(process.car.openId)
+				
+			}else{
+				if (!openId) {
+					this.getOpenId()
+				}
+			}
+			
+		// #endif
 		 //原代码 。判断是否是微信， 为了支持小程序调整
-		if(false|| !(process.env.NODE_ENV === "development") ){
-			if (false) {
-				if (checkOpenId) {
-					if (!openId) {
-						this.getOpenId();
-					} else {
-					 
-					}
-				}
-			} else{
-				alert("请使用微信打开本页面")
-			}
-		}else{
-			carhelp.setOpenId(process.car.openId)
-		}
+		
 		
 		
 	},
-	 
+	 	
 	getOpenId() {
-		
-		const code = getUrlParam('code');
-		var openId = carhelp.getOpenId()
-		if (!openId) {
-			if (!code) {
-				var url = "document.URL";
-				var getUrl= getWeixinRedirectURI(process.car.VUE_APP_WXAPPID, url);
-				 
-				var windowlocationhref = getUrl;
-			} else {
-				
-				API_WeiXin.getDataByCode(code).then(response => {
-					
-					carhelp.setOpenId(response.data.openid)
-					openId = response.data.openid;
-					carhelp.set("xpgj_wx_user_info",response.data)
-					
-					 location.reload();
-				}).catch(error => {
-					console.log(error);
-				});
-			}
+		var openId = carhelp.getOpenId()
+		if (!openId) {
+		
+			uni.login({
+				provider: 'weixin',
+				success: loginRes => {
+					
+					API_WeiXin.getDataByCode(loginRes.code).then(response => {
+						carhelp.setOpenId(response.data.openId)
+						//user_info 等属性 ，头像，名称，可通过授权获得  uniapp方法申请
+						//carhelp.set("xpgj_wx_user_info",response.data)
+						if(this.onload){
+							this.onload();
+						}						
+					}).catch(error => {
+						console.log(error);
+					});
+				}
+			});
+			
 		}
-	}
+	
+	}
+
 }
 module.exports = app

utils/request.js

@@ -19,6 +19,9 @@ const request = (options) => {
 	var k=options.url.indexOf(urlindex)==-1;
 	
 	 if(!openId&&k){
+		 setTimeout(()=>{
+			 request(options)
+		 },2000)
 		 return
 	 }
 	if(!k){
@@ -47,7 +50,8 @@ const request = (options) => {
 			if (res.data.code == 200&&res.data.result) {
 				
 				var token = res ? res.data.data.token : '';
-				carhelp.setPersonInfo(res.data.data.regUser );
+				
+				carhelp.setPersonInfo(res.data.data.memberInfo );
 				
 				carhelp.setToken(token);