소스 검색

代理人认证,首页改版

@dongkboy 1 년 전
부모
커밋
36a82f0350
46개의 변경된 파일634개의 추가작업 그리고 662개의 파일을 삭제
  1. 26 91
      components/modules/index/index-nav.vue
  2. 4 4
      config/baseUrl.js
  3. 217 220
      manifest.json
  4. 301 312
      pages/index/index.vue
  5. 1 0
      pages/login/login.vue
  6. 3 2
      pages/my/my.vue
  7. 34 12
      pages/register/orderissuer.vue
  8. 35 11
      pages/register/register.vue
  9. 1 0
      pages/set/set.vue
  10. 2 2
      pages/tools/addStaff/addStaff.vue
  11. 2 2
      pages/tools/addStaff/authentication.vue
  12. 2 1
      pages/tools/addStaff/authenticationSearch.vue
  13. 3 3
      pages/tools/addStaff/authenticationdetails.vue
  14. 3 2
      pages/tools/addStaff/employeeAdditionCount.vue
  15. BIN
      static/image/index/ad-img/ad.png
  16. BIN
      static/image/index/ad-img/ad1.png
  17. BIN
      static/image/index/ad-img/ad2.png
  18. BIN
      static/image/index/ad-img/ad3.png
  19. BIN
      static/image/index/category-img/1.png
  20. BIN
      static/image/index/category-img/10.png
  21. BIN
      static/image/index/category-img/2.png
  22. BIN
      static/image/index/category-img/3.png
  23. BIN
      static/image/index/category-img/4.png
  24. BIN
      static/image/index/category-img/5.png
  25. BIN
      static/image/index/category-img/6.png
  26. BIN
      static/image/index/category-img/7.png
  27. BIN
      static/image/index/category-img/8.png
  28. BIN
      static/image/index/category-img/9.png
  29. BIN
      static/image/index/img/Scan.png
  30. BIN
      static/image/index/img/cityicon.png
  31. BIN
      static/image/index/img/jiantou.png
  32. BIN
      static/image/index/pick-img/1.png
  33. BIN
      static/image/index/pick-img/10.png
  34. BIN
      static/image/index/pick-img/11.png
  35. BIN
      static/image/index/pick-img/12.png
  36. BIN
      static/image/index/pick-img/2.png
  37. BIN
      static/image/index/pick-img/3.png
  38. BIN
      static/image/index/pick-img/4.png
  39. BIN
      static/image/index/pick-img/5.png
  40. BIN
      static/image/index/pick-img/6.png
  41. BIN
      static/image/index/pick-img/7.png
  42. BIN
      static/image/index/pick-img/8.png
  43. BIN
      static/image/index/pick-img/9.png
  44. BIN
      static/image/index/pick-img/bg1.png
  45. BIN
      static/image/index/pick-img/bg2.png
  46. BIN
      static/image/index/pick-img/loding.png

+ 26 - 91
components/modules/index/index-nav.vue

@@ -1,11 +1,12 @@
 <template>
-	<view>
+	<view class="pages">
 		<swiper style="resistanceRatio : 0" class="swiper" :style="'height: '+currentPageHeight+'upx;'"
 			:duration="duration" :interval="interval" :autoplay="autoplay" @change="categoryChange">
 			<swiper-item v-for="(page, pageindex) in categoryList" :key="pageindex">
 				<view class="category-list">
 					<view class="icon" v-for="category in page" :key="category.cat_id" @tap="tapEvent(category)">
-						<image :src="category.img" style="width: 32px;height: 32px;"></image>
+						<image :src="category.img" :style="{width:category.width,height:category.height}" mode="">
+						</image>
 						<view class="category-title">{{ category.title }}</view>
 					</view>
 				</view>
@@ -15,7 +16,6 @@
 			<view v-for="(page, pageindex) in categoryList" :key="pageindex"
 				:class="{ active: pageindex == currentPageindex }"></view>
 		</view>
-
 		<u-toast :type="type" ref="uToast"></u-toast>
 	</view>
 </template>
@@ -156,7 +156,6 @@
 			event(item) {},
 			//分类跳转
 			async tapEvent(e) {
-				console.log(e);
 				this.form.name = "";
 				this.form.identifyNumber = "";
 				this.form.identifyValidDate = "";
@@ -164,18 +163,21 @@
 				this.form.name4 = "";
 				this.form.name5 = "";
 				this.form.xueli = "";
-				if (this.userInfo.sysUser.usertype == 'A') {
-					return uni.showToast({
-						icon: "none",
-						title: '没有权限',
-						duration: 1500
+				if (this.userInfo.sysUser.status == '0' && this.userInfo.sysUser.managementSource == '2') {
+					if (this.userInfo.sysUser.factorVerify == '2') {
+						uni.navigateTo({
+							url: "/pages/user/authInfo"
+						})
+					} else {
+						this.$emit('authModal', true);
+					}
+				} else if (this.userInfo.sysUser.status == '8' || this.userInfo.sysUser.status == '3') {
+					uni.navigateTo({
+						url: "/pages/user/practitionerInfo"
 					})
-				}
-				if (this.userInfo.sysUser.status == '2') {
-					uni.showToast({
-						icon: "none",
-						title: '请先通过实名认证',
-						duration: 1500
+				} else if (this.userInfo.sysUser.status == '2') {
+					uni.navigateTo({
+						url: "/pages/user/authResult1"
 					})
 				} else if (this.userInfo.sysUser.status == '1') {
 					if (!e.src || e.src == '#' || e.src == '') {
@@ -191,82 +193,7 @@
 					}
 				}
 
-				// if (this.userInfo.sysUser.status == '2') {
-				// 	let res = await this.$http.get('/apps/getApplicationStatus?jobNumber=' + this.userInfo.sysUser.id);
-				// 	if (res.code == 200) {
-				// 		this.getApplicationStatus = res.data;
-				// 		if (this.getApplicationStatus == '0') {
-				// 			if (!e.src || e.src == '#' || e.src == '') {
-				// 				uni.showToast({
-				// 					icon: "none",
-				// 					title: '正在开发中...',
-				// 					duration: 1500
-				// 				})
-				// 			} else {
-				// 				uni.showToast({
-				// 					icon: "none",
-				// 					title: '该账户已删除',
-				// 					duration: 1500
-				// 				})
-				// 			}
-				// 		} else if (this.getApplicationStatus == '3') {
-				// 			if (!e.src || e.src == '#' || e.src == '') {
-				// 				uni.showToast({
-				// 					icon: "none",
-				// 					title: '正在开发中...',
-				// 					duration: 1500
-				// 				})
-				// 			} else {
-				// 				uni.showToast({
-				// 					icon: "none",
-				// 					title: '实名认证不通过,请修改后提交',
-				// 					duration: 1500
-				// 				})
-				// 				setTimeout(() => {
-				// 					uni.navigateTo({
-				// 						url: '/pages/user/certification'
-				// 					})
-				// 				}, 1000)
-				// 			}
-				// 		}
-				// 		else if (this.getApplicationStatus == '2') {
-				// 			uni.showToast({
-				// 				icon: "none",
-				// 				title: '请先通过实名认证',
-				// 				duration: 1500
-				// 			})
-				// 		}
-				// 	} else {
-				// 		if (!e.src || e.src == '#' || e.src == '') {
-				// 			uni.showToast({
-				// 				icon: "none",
-				// 				title: '正在开发中...',
-				// 				duration: 1500
-				// 			})
-				// 		} else {
-				// 			this.show();
-				// 			setTimeout(() => {
-				// 				uni.navigateTo({
-				// 					url: '/pages/user/infoInput'
-				// 				})
-				// 			}, 1000)
-				// 		}
-				// 	}
-				// } else if (this.userInfo.sysUser.status == '1') {
-				// 	if (!e.src || e.src == '#' || e.src == '') {
-				// 		uni.showToast({
-				// 			icon: "none",
-				// 			title: '正在开发中...',
-				// 			duration: 1500
-				// 		})
-				// 	} else {
-				// 			this.navigate({
-				// 				url: e.src
-				// 			}, "navigateTo", true)
-				// 	}
-				// } else {
-				// 	this.show1 = false;
-				// }
+
 			},
 			xueliConfirm(e) {
 				this.form.xueli = e[0].value;
@@ -280,6 +207,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.pages {
+		background: #FFFFFF;
+		box-shadow: 0px 2px 5px 0px rgba(176, 176, 176, 0.05);
+		border-radius: 6px;
+		padding: 10px 10px;
+	}
+
 	.dots {
 		display: flex;
 		justify-content: center;
@@ -301,6 +235,7 @@
 
 	.swiper {
 		padding-bottom: 8upx;
+
 	}
 
 	.category-list {

+ 4 - 4
config/baseUrl.js

@@ -13,7 +13,7 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "https://pre.baoxianzhanggui.com/test"; //生产
 	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
-	socketUrl = "wss://sxzgkj.baoxianzhanggui.com/web-api/websocket";
+	// socketUrl = "wss://sxzgkj.baoxianzhanggui.com/web-api/websocket";
 	// socketUrl = "ws://192.168.0.52:8080/websocket";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
@@ -21,9 +21,9 @@ if (process.env.NODE_ENV === 'development') {
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
-	// baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
-	// h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
-	socketUrl = "wss://sxzgkj.baoxianzhanggui.com/web-api/websocket";
+	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
+	// socketUrl = "wss://sxzgkj.baoxianzhanggui.com/web-api/websocket";
 }
 const courtConfig = {
 	//微信公众号APPID

+ 217 - 220
manifest.json

@@ -1,222 +1,219 @@
 {
-    "name" : "晋掌柜",
-    "appid" : "__UNI__D4FE29A",
-    "description" : "保险类app",
-    "transformPx" : false,
-    "icons" : [
-        {
-            "sizes" : "分辨率,192x192",
-            "src" : "图片路径"
-        }
-    ],
-    "versionName" : "3.0.4",
-    "versionCode" : 304,
-    "app-plus" : {
-        "error" : {
-            "url" : "hybrid/html/error.html"
-        },
-        "compatible" : {
-            "ignoreVersion" : true
-        },
-        "privacy" : {
-            "prompt" : "template",
-            "template" : {
-                "title" : "平台协议和隐私协议",
-                "message" : "欢迎使用晋掌柜app,我们非常重视您的个人信息和隐私保护。我们将通过《隐私权保护政策》帮助您了解我们收集、使用、存储、共享和保护个人信息的情况,以及您所享有的相关权利。<br/> 为了更好的向您提供注册认证、线上投保、以及周边服务等相关服务功能,我们会收集、使用必要的信息。包括但不限于:<br/>1、为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。2、在使用道路救援功能时,基于您的授权我们可能会获取您的位置信息,以便为您提供服务。您有权拒绝或取消授权。在使用线上投保以及注册等功能时, 基于您的授权我们会获取您的相册存储的权限, 以便在使用时能够正确的上传个人资料。获取通知权限, 用于向您发送重要通知, 如服务更新或安全提醒。<br/>   请仔细阅读<a href='https://sxzgkj.baoxianzhanggui.com/h5/#/pages/login/xieyi'>《平台协议》</a>和<a href='https://sxzgkj.baoxianzhanggui.com/h5/#/pages/login/mimi'>《隐私协议》</a>了解详细信息。我们将按照您同意的条款使用您的个人信息,以便为您提供服务。",
-                "buttonAccept" : "同意",
-                "buttonRefuse" : "暂不同意"
-            }
-        },
-        "modules" : {
-            "Messaging" : {},
-            "OAuth" : {},
-            "Payment" : {},
-            "Share" : {},
-            "SQLite" : {
-                "description" : "iBeacon"
-            },
-            "Camera" : {},
-            "Maps" : {},
-            "Geolocation" : {}
-        },
-        "distribute" : {
-            "android" : {
-                "permissionPhoneState" : {
-                    "request" : "none",
-                    "prompt" : "为保证您正常、安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许。"
-                },
-                "permissionExternalStorage" : {
-                    "request" : "none",
-                    "prompt" : "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
-                },
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
-                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "minSdkVersion" : 21,
-                "schemes" : "zgcxapp",
-                "targetSdkVersion" : 30
-            },
-            "sdkConfigs" : {
-                "ad" : {
-                    "ks" : {},
-                    "sigmob" : {}
-                },
-                "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "android" ],
-                        "appid" : "wx612ca90988c46947",
-                        "UniversalLinks" : ""
-                    }
-                },
-                "share" : {
-                    "weixin" : {
-                        "appid" : "wx612ca90988c46947",
-                        "UniversalLinks" : ""
-                    }
-                },
-                "oauth" : {
-                    "weixin" : {
-                        "appid" : "wx612ca90988c46947",
-                        "appsecret" : "75b7d4cda453b2075dec23f849278bc0",
-                        "UniversalLinks" : ""
-                    }
-                },
-                "geolocation" : {
-                    "amap" : {
-                        "name" : "amap_18335592986CWFSxSLAB",
-                        "__platform__" : [ "android" ],
-                        "appkey_ios" : "e410fdbf6be7110af9267b6d56c93c8d",
-                        "appkey_android" : "e410fdbf6be7110af9267b6d56c93c8d"
-                    },
-                    "system" : {
-                        "__platform__" : [ "ios", "android" ]
-                    }
-                },
-                "push" : {
-                    "unipush" : {
-                        "appid" : "YDcU8mcWRO6MWIT1i4naP2",
-                        "appkey" : "DK2LTzhnc87pFFFhcTSgs8",
-                        "appsecret" : "wTUMKWB4ReAoPyCp7Jyaz9"
-                    }
-                },
-                "maps" : {
-                    "amap" : {
-                        "name" : "amap_18335592986CWFSxSLAB",
-                        "appkey_ios" : "e410fdbf6be7110af9267b6d56c93c8d",
-                        "appkey_android" : "e410fdbf6be7110af9267b6d56c93c8d"
-                    }
-                }
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            },
-            "splashscreen" : {
-                "androidStyle" : "common",
-                "useOriginalMsgbox" : true
-            },
-            "ios" : {
-                "dSYMs" : false,
-                "urltypes" : "zgcxapp"
-            }
-        },
-        "compilerVersion" : 3,
-        "nvueLaunchMode" : "fast",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true
-        },
-        "nativePlugins" : {}
-    },
-    // 5+App特有相关
-    "quickapp" : {},
-    // 快应用特有相关
-    "mp-weixin" : {
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : false,
-            "postcss" : false,
-            "minified" : false
-        },
-        "usingComponents" : true,
-        "appid" : "wxe57ddfbe230bcfba",
-        "permission" : {}
-    },
-    "h5" : {
-        "template" : "template.h5.html",
-        "router" : {
-            "mode" : "hash",
-            "base" : "./"
-        },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
-        },
-        "devServer" : {
-            "https" : false,
-            "port" : 80
-        },
-        "sdkConfigs" : {
-            "maps" : {}
-        },
-        "uniStatistics" : {
-            "enable" : false
-        }
-    },
-    "mp-jd" : {
-        "unipush" : {
-            "enable" : false
-        }
-    }
+	"name": "晋掌柜",
+	"appid": "__UNI__D4FE29A",
+	"description": "保险类app",
+	"transformPx": false,
+	"icons": [{
+		"sizes": "分辨率,192x192",
+		"src": "图片路径"
+	}],
+	"versionName": "3.0.5",
+	"versionCode": 305,
+	"app-plus": {
+		"error": {
+			"url": "hybrid/html/error.html"
+		},
+		"compatible": {
+			"ignoreVersion": true
+		},
+		"privacy": {
+			"prompt": "template",
+			"template": {
+				"title": "平台协议和隐私协议",
+				"message": "欢迎使用晋掌柜app,我们非常重视您的个人信息和隐私保护。我们将通过《隐私权保护政策》帮助您了解我们收集、使用、存储、共享和保护个人信息的情况,以及您所享有的相关权利。<br/> 为了更好的向您提供注册认证、线上投保、以及周边服务等相关服务功能,我们会收集、使用必要的信息。包括但不限于:<br/>1、为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。2、在使用道路救援功能时,基于您的授权我们可能会获取您的位置信息,以便为您提供服务。您有权拒绝或取消授权。在使用线上投保以及注册等功能时, 基于您的授权我们会获取您的相册存储的权限, 以便在使用时能够正确的上传个人资料。获取通知权限, 用于向您发送重要通知, 如服务更新或安全提醒。<br/>   请仔细阅读<a href='https://sxzgkj.baoxianzhanggui.com/h5/#/pages/login/xieyi'>《平台协议》</a>和<a href='https://sxzgkj.baoxianzhanggui.com/h5/#/pages/login/mimi'>《隐私协议》</a>了解详细信息。我们将按照您同意的条款使用您的个人信息,以便为您提供服务。",
+				"buttonAccept": "同意",
+				"buttonRefuse": "暂不同意"
+			}
+		},
+		"modules": {
+			"Messaging": {},
+			"OAuth": {},
+			"Payment": {},
+			"Share": {},
+			"SQLite": {
+				"description": "iBeacon"
+			},
+			"Camera": {},
+			"Maps": {},
+			"Geolocation": {}
+		},
+		"distribute": {
+			"android": {
+				"permissionPhoneState": {
+					"request": "none",
+					"prompt": "为保证您正常、安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许。"
+				},
+				"permissionExternalStorage": {
+					"request": "none",
+					"prompt": "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
+				},
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+					"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
+				"minSdkVersion": 21,
+				"schemes": "zgcxapp",
+				"targetSdkVersion": 30
+			},
+			"sdkConfigs": {
+				"ad": {
+					"ks": {},
+					"sigmob": {}
+				},
+				"payment": {
+					"weixin": {
+						"__platform__": ["android"],
+						"appid": "wx612ca90988c46947",
+						"UniversalLinks": ""
+					}
+				},
+				"share": {
+					"weixin": {
+						"appid": "wx612ca90988c46947",
+						"UniversalLinks": ""
+					}
+				},
+				"oauth": {
+					"weixin": {
+						"appid": "wx612ca90988c46947",
+						"appsecret": "75b7d4cda453b2075dec23f849278bc0",
+						"UniversalLinks": ""
+					}
+				},
+				"geolocation": {
+					"amap": {
+						"name": "amap_18335592986CWFSxSLAB",
+						"__platform__": ["android"],
+						"appkey_ios": "e410fdbf6be7110af9267b6d56c93c8d",
+						"appkey_android": "e410fdbf6be7110af9267b6d56c93c8d"
+					},
+					"system": {
+						"__platform__": ["ios", "android"]
+					}
+				},
+				"push": {
+					"unipush": {
+						"appid": "YDcU8mcWRO6MWIT1i4naP2",
+						"appkey": "DK2LTzhnc87pFFFhcTSgs8",
+						"appsecret": "wTUMKWB4ReAoPyCp7Jyaz9"
+					}
+				},
+				"maps": {
+					"amap": {
+						"name": "amap_18335592986CWFSxSLAB",
+						"appkey_ios": "e410fdbf6be7110af9267b6d56c93c8d",
+						"appkey_android": "e410fdbf6be7110af9267b6d56c93c8d"
+					}
+				}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			},
+			"splashscreen": {
+				"androidStyle": "common",
+				"useOriginalMsgbox": true
+			},
+			"ios": {
+				"dSYMs": false,
+				"urltypes": "zgcxapp"
+			}
+		},
+		"compilerVersion": 3,
+		"nvueLaunchMode": "fast",
+		"splashscreen": {
+			"alwaysShowBeforeRender": true
+		},
+		"nativePlugins": {}
+	},
+	// 5+App特有相关
+	"quickapp": {},
+	// 快应用特有相关
+	"mp-weixin": {
+		"setting": {
+			"urlCheck": false,
+			"es6": false,
+			"postcss": false,
+			"minified": false
+		},
+		"usingComponents": true,
+		"appid": "wxe57ddfbe230bcfba",
+		"permission": {}
+	},
+	"h5": {
+		"template": "template.h5.html",
+		"router": {
+			"mode": "hash",
+			"base": "./"
+		},
+		"optimization": {
+			"treeShaking": {
+				"enable": true
+			}
+		},
+		"devServer": {
+			"https": false,
+			"port": 80
+		},
+		"sdkConfigs": {
+			"maps": {}
+		},
+		"uniStatistics": {
+			"enable": false
+		}
+	},
+	"mp-jd": {
+		"unipush": {
+			"enable": false
+		}
+	}
 }
-// 小程序特有相关
-
+// 小程序特有相关

+ 301 - 312
pages/index/index.vue

@@ -1,45 +1,118 @@
 <template>
-	<view style="background: #F8FAFE;">
+	<view>
 		<public-module></public-module>
 		<service-widget @btnClick="btn_click"></service-widget>
-		<view class="header dis a-c j-s">
+		<view class="header dis a-c j-s" :style="transitionStyle">
 			<view class="city dis a-c ">
 				<image src="../../static/image/index/img/cityicon.png" mode=""></image>
 				<text>{{city}}</text>
 				<image src="../../static/image/index/img/jiantou.png" mode="" style="width: 12px;height: 12px;"></image>
 			</view>
-			<image src="../../static/image/index/img/Scan.png" mode="" @click="scan"></image>
+			<view class="search" style="">
+				<u-search :show-action="true" action-text="搜索" bg-color="#fff" maxlength="10" placeholder="请输入关键词"
+					:clearabled="false" :action-style="{position: 'absolute',right:'10px'}" search-icon="0">
+				</u-search>
+				<image class="search-Scan" src="../../static/image/index/img/Scan.png" mode="" @click="scan">
+				</image>
+			</view>
+		</view>
+		<!-- 占位块 -->
+		<view class="place"></view>
+		<view class="swiperelement" :style="transitionStyle">
+			<u-swiper :list="swiperlist" height="238" duration="400" interval="4000" mode="rect"
+				@change="swiperChange"></u-swiper>
 		</view>
-		<view class="page">
-			<!-- 认证提示 -->
-			<view class="dis a-c j-s">
-				<view class="frequentClasses dis f-c " :style="{backgroundImage:`url(${item.img})`}"
-					v-for="(item,index) in frequentClassesList" :key="index" @click="tapEvent(item)">
-					<text>{{item.title}}</text>
-					<text>{{item.description}}</text>
+		<view class="pagebody">
+			<index-nav :resdata="categoryList" :row="2" @authModal="authModal" style="margin-bottom: 14px;"></index-nav>
+			<view class="mt-2 dis j-s a-c">
+				<view class="activity dis f-c ">
+					<text>签到有礼</text>
+					<text>福利多多</text>
+					<image src="../../static/image/index/pick-img/1.png" mode="" style="width: 32px;height: 32px;">
+					</image>
+				</view>
+				<view class="activity dis f-c ">
+					<text>精彩任务</text>
+					<text>奖励多多</text>
+					<image src="../../static/image/index/pick-img/2.png" mode="" style="width: 36px;height: 32px;">
+					</image>
+				</view>
+				<view class="activity dis f-c ">
+					<text>限时秒杀</text>
+					<text>9.9元起</text>
+					<image src="../../static/image/index/pick-img/3.png" mode="" style="width: 32px;height: 32px;">
+					</image>
 				</view>
 			</view>
-			<index-nav :resdata="categoryList" :row="1" style="margin: 14px 0;"></index-nav>
-			<view class="banner">
-				<image mode="widthFix" src="/static/image/index/ad-img/ad.png" @click="back"></image>
-			</view>
-			<view class="topProducts dis  f-c ">
-				<text class="title mt-2 mb-2">精选产品</text>
-				<view class="data dis f-c">
-					<view class="Product dis a-c " v-for="(item,index) in pickList" :key="index">
-						<image :src="item.img" mode=""></image>
-						<view class="dis f-c a-start item">
-							<text
-								style="color: #232832;font-size: 16px;font-weight: bold;letter-spacing: 1px;">{{item.title}}</text>
-							<text style="color: rgba(35, 40, 50, 0.6);font-size: 12px;">{{item.sum}}人购买</text>
-							<view class="dis a-c">
-								<view class="slogan" :style="{backgroundColor:itemslogan.back,color:itemslogan.color}"
-									v-for="(itemslogan,indexslogan) in item.slogan" :key="indexslogan">
-									<text>{{itemslogan.name}}</text>
-								</view>
-							</view>
-							<text style="color: rgba(35, 40, 50, 0.6);font-size: 12px;"><text
-									style="color: #FF6C29;font-size: 16px;margin-right: 3px;">{{item.price}}</text>/年起</text>
+			<view class="mt-3 dis j-s ">
+				<view class="flashSale dis f-c">
+					<image class="bg1" src="../../static/image/index/pick-img/bg1.png" mode=""></image>
+					<view class="title dis j-s">
+						<image src="../../static/image/index/pick-img/4.png" mode="widthFix"
+							style="width: 73px;height: 25px;"></image>
+						<view class="dis a-c">
+							<image src="../../static/image/index/pick-img/loding.png" mode=""
+								style="width: 12px;height: 12px;"></image>
+							<text>换一批</text>
+						</view>
+					</view>
+					<view class="dis j-s a-c mt-2">
+						<image src="../../static/image/index/pick-img/5.png" mode="" style="width: 53px;height: 53px;">
+						</image>
+						<image src="../../static/image/index/pick-img/8.png" mode="" style="width: 80px;height: 56px;">
+						</image>
+					</view>
+					<view class="dis j-s a-c mt-2">
+						<image src="../../static/image/index/pick-img/6.png" mode="" style="width: 53px;height: 53px;">
+						</image>
+						<image src="../../static/image/index/pick-img/9.png" mode="" style="width: 80px;height: 56px;">
+						</image>
+					</view>
+					<view class="dis j-s a-c mt-2">
+						<image src="../../static/image/index/pick-img/7.png" mode="" style="width: 53px;height: 53px;">
+						</image>
+						<image src="../../static/image/index/pick-img/8.png" mode="" style="width: 80px;height: 56px;">
+						</image>
+					</view>
+				</view>
+				<view class="hotSaleList dis f-c">
+					<image class="bg1" src="../../static/image/index/pick-img/bg2.png" mode=""></image>
+					<view class="title dis j-s">
+						<text style="font-size: 17px;color: #333;font-weight: bold;">热销榜</text>
+						<view class="dis a-c">
+							<image src="../../static/image/index/pick-img/loding.png" mode=""
+								style="width: 12px;height: 12px;"></image>
+							<text>换一批</text>
+						</view>
+					</view>
+					<view class="mt-2 dis a-c j-s content" style="position: relative;">
+						<image src="../../static/image/index/pick-img/10.png" mode=""
+							style="width: 53px;height: 53px;margin-right: 8px;">
+						</image>
+						<view class="dis f-c " style="width: 55%;">
+							<text style="font-size: 12px;color: #333;line-height: 1.2;">车仆后视镜弹水剂 新升级...</text>
+							<text style="color: #FF476C;font-size: 12px;">¥ <text
+									style="font-size: 15px;font-weight: bold;line-height: 1.2;">79</text> </text>
+						</view>
+					</view>
+					<view class="mt-2 dis a-c j-s " style="position: relative;">
+						<image src="../../static/image/index/pick-img/11.png" mode=""
+							style="width: 53px;height: 53px;margin-right: 8px;">
+						</image>
+						<view class="dis f-c " style="width: 55%;">
+							<text style="font-size: 12px;color: #333;line-height: 1.2;">朗龙汽车香水车载香薰摆...</text>
+							<text style="color: #FF476C;font-size: 12px;">¥ <text
+									style="font-size: 15px;font-weight: bold; line-height: 1.2;">65.9</text> </text>
+						</view>
+					</view>
+					<view class=" dis a-c j-s mt-2" style="position: relative;">
+						<image src="../../static/image/index/pick-img/12.png" mode=""
+							style="width: 53px;height: 53px;margin-right: 8px;">
+						</image>
+						<view class="dis f-c  a-start " style="width: 55%;">
+							<text style="font-size: 12px;color: #333;line-height: 1.2;">新车除甲醛除异味车内除...</text>
+							<text style="color: #FF476C;font-size: 12px;">¥ <text
+									style="font-size: 15px;font-weight: bold;line-height: 1.2;">29.5</text> </text>
 						</view>
 					</view>
 				</view>
@@ -70,6 +143,7 @@
 		},
 		data() {
 			return {
+
 				authShow: false,
 				locationshow: false,
 				avatar: "",
@@ -101,72 +175,85 @@
 				banben: {},
 				bgColor: "#4B75EB",
 				//轮播
-				//分类
-				frequentClassesList: [{
+				categoryList: [{
 						cat_id: 0,
-						img: '../../static/image/index/category-img/1.png',
+						img: '/static/image/index/category-img/1.png',
 						title: '车险',
-						description: "快速比价",
-						src: '/pages/carInsure/entry'
+						src: '/pages/carInsure/entry',
+						width: '40px',
+						height: '30px',
 					},
 					{
 						cat_id: 1,
 						img: '/static/image/index/category-img/2.png',
-						title: '道路救援',
-						description: "紧急预警",
-						src: '/pages/roadRescue/index'
+						title: '车损测算',
+						width: '40px',
+						height: '30px',
+						// src: '/pages/carInsure2/entry'
 					},
 					{
 						cat_id: 2,
 						img: '/static/image/index/category-img/3.png',
-						title: '审车',
-						description: "用车无烦恼",
-						src: ''
+						title: '道路救援',
+						src: '/pages/roadRescue/index',
+						width: '40px',
+						height: '30px',
 					},
 					{
 						cat_id: 3,
 						img: '/static/image/index/category-img/4.png',
-						title: '车检代办',
-						description: "便捷处理",
-						src: '/pages/caragent/index'
+						title: '司法鉴定',
+						width: '40px',
+						height: '30px',
+						src: '',
+
 					},
-				],
-				categoryList: [{
-						cat_id: 0,
+					{
+						cat_id: 4,
 						img: '/static/image/index/category-img/5.png',
-						title: '车损测算',
-						// src: '/pages/carInsure2/entry'
+						title: '掌柜商城',
+						width: '40px',
+						height: '30px',
+						src: ''
 					},
 					{
-						cat_id: 1,
+						cat_id: 5,
 						img: '/static/image/index/category-img/6.png',
-						title: '司法鉴定',
+						title: '洗车',
+						width: '32px',
+						height: '32px',
 						src: ''
 					},
 					{
-						cat_id: 2,
+						cat_id: 6,
 						img: '/static/image/index/category-img/7.png',
-						title: '掌柜商城',
-						src: ''
+						title: '车检代办',
+						width: '32px',
+						height: '32px',
+						src: '/pages/caragent/index'
 					},
 					{
-						cat_id: 3,
+						cat_id: 7,
 						img: '/static/image/index/category-img/8.png',
-						title: '洗车',
+						title: '审车',
+						width: '32px',
+						height: '32px',
 						src: ''
 					},
-
 					{
-						cat_id: 4,
+						cat_id: 8,
 						img: '/static/image/index/category-img/9.png',
 						title: '代驾',
+						width: '32px',
+						height: '32px',
 						src: ''
 					},
-
 					{
-						cat_id: 5,
+						cat_id: 9,
 						img: '/static/image/index/category-img/10.png',
 						title: '一键挪车',
+						width: '32px',
+						height: '32px',
 						src: '/pages/ticket/ticket'
 					}
 				],
@@ -243,7 +330,19 @@
 						title: "平安行.境内节假日出行意..."
 					},
 				],
-
+				swiperlist: [{
+						image: '/static/image/index/ad-img/ad1.png',
+						backgroundColor: '#3385F5'
+					},
+					{
+						image: '/static/image/index/ad-img/ad2.png',
+						backgroundColor: '#F5B333'
+					},
+					{
+						image: '/static/image/index/ad-img/ad3.png',
+						backgroundColor: '#FF6591'
+					}
+				],
 				headerPosition: "fixed",
 				getApplicationStatus: "",
 				socketOpen: false,
@@ -257,10 +356,12 @@
 				poiName: "",
 				cityCode: "",
 				messageInterval: null,
+				transitionStyle: {
+					backgroundColor: '#3385F5',
+				}
 			};
 		},
 
-
 		computed: {
 			...mapState(['userInfo'])
 		},
@@ -290,19 +391,17 @@
 			// #endif
 
 		},
-		async onLoad() {
-
-
-
-		},
+		async onLoad() {},
 		async onPullDownRefresh() {
 			await this.loginUser();
 			uni.stopPullDownRefresh();
-
-
-
 		},
 		methods: {
+			swiperChange(index) {
+				let color = this.swiperlist.find((val, ele) => ele == index);
+				this.transitionStyle.backgroundColor = color.backgroundColor;
+
+			},
 			async loginUser() {
 				let userInfoRes = await this.$http.get('/user/loginUser')
 				store.commit('setUserModules', {
@@ -314,37 +413,10 @@
 					}
 				})
 			},
-			tapEvent(item) {
-				if (this.userInfo.sysUser.status == '0' && this.userInfo.sysUser.managementSource == '2') {
-					if (this.userInfo.sysUser.factorVerify == '2') {
-						uni.navigateTo({
-							url: "/pages/user/authInfo"
-						})
-					} else {
-						this.authShow = true;
-					}
-				} else if (this.userInfo.sysUser.status == '8' || this.userInfo.sysUser.status == '3') {
-					uni.navigateTo({
-						url: "/pages/user/practitionerInfo"
-					})
-				} else if (this.userInfo.sysUser.status == '2') {
-					uni.navigateTo({
-						url: "/pages/user/authResult1"
-					})
-				} else if (this.userInfo.sysUser.status == '1') {
-					if (!item.src || item.src == '#' || item.src == '') {
-						uni.showToast({
-							icon: "none",
-							title: '正在开发中...',
-							duration: 1500
-						})
-					} else {
-						this.navigate({
-							url: item.src
-						}, "navigateTo", true)
-					}
-				}
+			authModal(res) {
+				this.authShow = res;
 			},
+
 			btn_click() {
 				uni.navigateTo({
 					url: '/pages/chat/chat'
@@ -467,58 +539,7 @@
 					}
 				});
 			},
-			// 验证银行卡
-			async validateBankCard() {
-				var that = this;
-				that.bankname = "";
-				await bankBin.getBankBin(this.form.name4)
-					.then((data) => {
-						that.form.name5 = data.bankName;
-						return true;
-					})
-					.catch((err) => {
-						return uni.showToast({
-							title: err.split(":")[1],
-							icon: "none"
-						});
-					})
-			},
 
-			//点击通知
-			async click(index) {
-				let res1 = await this.$http.get('/apps/getApplicationStatus?jobNumber=' + this.userInfo.sysUser.id);
-				if (res1.code == 200) {
-					this.getApplicationStatus = res1.data;
-					if (this.getApplicationStatus == '0') {
-						uni.showToast({
-							icon: "none",
-							title: '实名认证等待审核中',
-							duration: 1500
-						})
-					} else if (this.getApplicationStatus == '3') {
-						uni.showToast({
-							icon: "none",
-							title: '实名认证不通过,请修改后提交',
-							duration: 1500
-						})
-						setTimeout(() => {
-							uni.navigateTo({
-								url: '/pages/user/certification'
-							})
-						}, 1000)
-					}
-				} else if (res1.code != '200') {
-					setTimeout(() => {
-						uni.navigateTo({
-							url: '/pages/user/infoInput'
-						})
-					}, 1000)
-				}
-				if (res1.code == 200) {
-					this.getApplicationStatus = res1.data;
-				}
-
-			},
 			//扫一扫
 			scan() {
 				uni.scanCode({
@@ -554,11 +575,27 @@
 	};
 </script>
 <style lang="scss" scoped>
-	page {
-		background: #F8FAFE;
+	@import '@/style/mixin.scss';
+
+	/deep/ {
+		.u-content {
+			padding-left: 40px;
+		}
+
+		.u-indicator-item-rect-active {
+			background-color: #fff;
+		}
+
+		.u-indicator-item-rect {
+			border-radius: 2px;
+			height: 3px;
+		}
 	}
 
 
+	page {
+		background-color: #EEF1F7;
+	}
 
 	.status {
 		width: 100%;
@@ -579,7 +616,7 @@
 		right: 0;
 		z-index: 996;
 		padding: 60px 16px 16px;
-		background-color: #fff;
+		transition: background-color 0.5s;
 
 		.city {
 			color: #fff;
@@ -591,7 +628,7 @@
 			}
 
 			text {
-				color: #333;
+				color: #fff;
 				font-size: 13px;
 				margin: 0 5px;
 			}
@@ -602,194 +639,146 @@
 			}
 		}
 
-		image {
-			width: 22px;
-			height: 22px;
+		.search {
+			position: relative;
+			width: 70%;
+
+			.search-Scan {
+				width: 20px;
+				height: 20px;
+				position: absolute;
+				left: 10px;
+				top: 0;
+				bottom: 0;
+				margin: auto;
+				padding-right: 5px;
+
+				::after {
+					content: "";
+					width: 0px;
+					height: 13px;
+					border: 1px solid #DDDDDD;
+					position: absolute;
+					right: 0;
+					top: 0;
+					bottom: 0;
+					margin: auto;
+				}
+			}
+
+
+		}
+	}
+
+	.swiperelement {
+		height: 70px;
+		border-radius: 0px 0px 20px 0px;
+		padding: 10px 16px 0;
+		transition: background-color 0.5s;
+		/* 渐变效果 */
+
+		::after {
+			content: "";
+			display: table;
+			clear: both;
 		}
 	}
 
-	.page {
-		padding: 115px 16px 16px 16px;
+	.pagebody {
+		padding: 75px 16px 16px;
+		height: calc(100vh - 180px);
+		background-color: #F8F8FA;
 
-		.frequentClasses {
-			width: 148rpx;
-			height: 148rpx;
-			padding: 5px;
-			background-size: cover;
+		.activity {
+			width: 30%;
+			background: #FFFFFF;
+			padding: 8px;
+			border-radius: 6px;
+			position: relative;
 
 			text:nth-child(1) {
-				color: #fff;
-				font-size: 28rpx;
-				line-height: 1;
+				font-size: 14px;
+				color: #333333;
+				font-weight: bold;
 			}
 
 			text:nth-child(2) {
-				color: #fff;
-				font-size: 22rpx;
+				font-size: 12px;
+				color: #999;
 			}
-		}
 
-		.topProducts {
-			.title {
-				color: #232832;
-				font-size: 32rpx;
-				font-weight: bold;
+			image {
+				position: absolute;
+				right: 0;
+				bottom: 0;
 			}
+		}
 
-			.data {
-				background: #FFFFFF;
-				box-shadow: 0px 2px 5px 0px #DAE3F4;
-				border-radius: 6px;
-				padding: 16px;
+		.flashSale {
+			width: 48%;
+			background: #FFFFFF;
+			border-radius: 6px;
+			position: relative;
+			padding: 8px;
+
+			.bg1 {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 67px;
 			}
 
-			.Product {
-				margin-bottom: 14px;
-
-				image {
-					width: 85px;
-					height: 85px;
-					margin-right: 14px;
-				}
-
-				.item {
-					line-height: 1.5;
+			.title {
+				position: relative;
 
-					.slogan {
-						padding: 1px 3px;
-						border-radius: 2px;
-						font-size: 22rpx;
-						margin-right: 5px;
-					}
+				text {
+					font-size: 22rpx;
+					color: #999;
+					margin-left: 3px;
 				}
-
-
-
 			}
-		}
-	}
-
-	/* 占位 */
-	.place {
-		/*  #ifdef  APP-PLUS  */
-		margin-top: var(--status-bar-height);
-		/*  #endif  */
-		height: 106upx;
-	}
-
-	.pick {
-		padding: 0 2.5vw 2.5vw 2.5vw;
-	}
-
-	.pick .box {
-		width: 100%;
-		border-radius: 20upx;
-		background-color: #ffffff;
-	}
-
-	.pick .box .title {
-		display: flex;
-		justify-content: flex-start;
-		align-items: flex-end;
-		height: 60upx;
-		border-bottom: solid 1upx #eee;
-		padding-bottom: 10upx;
-	}
-
-	.pick .box .title .big {
-		font-size: 34upx;
-		padding-left: 20upx;
-		color: #46434f;
-	}
 
-	.pick .box .title .small {
-		font-size: 24upx;
-		padding-left: 20upx;
-		color: #827f8b;
-	}
-
-	.pick .box .product-list {
-		padding-top: 15upx;
-		box-sizing: border-box;
-		overflow: hidden;
-	}
+		}
 
-	.pick .box .product-list>view {
-		background-color: #f8f8f8;
-		display: inline-block;
-		width: calc(50% - 10upx);
-		position: relative;
-		box-sizing: border-box;
-		margin: 5upx;
-		float: left;
-	}
+		.hotSaleList {
+			width: 48%;
+			background: #FFFFFF;
+			border-radius: 6px;
+			position: relative;
+			padding: 8px;
+
+			.bg1 {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 67px;
+			}
 
-	.pick .box .product-list>view:nth-child(1) {
-		height: 390upx;
-	}
+			.title {
+				position: relative;
 
-	.pick .box .product-list>view:nth-child(2),
-	.pick .box .product-list>view:nth-child(3) {
-		height: 190upx;
-	}
+				text {
+					font-size: 22rpx;
+					color: #999;
+					margin-left: 3px;
+				}
+			}
 
-	.pick .box .product-list>view:nth-child(1) .price {
-		color: #e65339;
-		font-size: 26upx;
-		position: absolute;
-		bottom: 6upx;
-		left: 8upx;
-	}
 
-	.pick .box .product-list>view:nth-child(1) .slogan {
-		color: #807c87;
-		font-size: 26upx;
-		position: absolute;
-		bottom: 6upx;
-		right: 15upx;
-	}
 
-	.pick .box .product-list>view:nth-child(1) image {
-		width: 100%;
-		height: 350upx !important;
-		padding: 15upx;
-		box-sizing: border-box;
-		margin-bottom: 40upx;
-	}
+		}
 
-	.pick .box .product-list>view:nth-child(2),
-	.pick .box .product-list>view:nth-child(3) {
-		padding: 10upx;
-		box-sizing: border-box;
 	}
 
-	.pick .box .product-list>view:nth-child(2) image,
-	.pick .box .product-list>view:nth-child(3) image {
-		width: calc(50% - 5upx);
-		height: 170upx !important;
+	/* 占位 */
+	.place {
+		height: 108px;
 	}
 
-	.pick .box .product-list>view:nth-child(2) .price,
-	.pick .box .product-list>view:nth-child(3) .price {
-		position: absolute;
-		top: 25%;
-		left: 55%;
-		color: #e65339;
-		font-size: 30upx;
-	}
 
-	.pick .box .product-list>view:nth-child(2) .slogan,
-	.pick .box .product-list>view:nth-child(3) .slogan {
-		position: absolute;
-		top: 60%;
-		left: 55%;
-		color: #807c87;
-		font-size: 26upx;
-	}
 
-	.banner image {
-		width: 100%;
-	}
 
 	.goods-list {
 		background-color: #f4f4f4;

+ 1 - 0
pages/login/login.vue

@@ -118,6 +118,7 @@
 				<view class="heng1" @click="queren" style="background-color: orangered;">确认</view>
 			</view>
 		</u-popup>
+
 	</view>
 </template>
 <script>

+ 3 - 2
pages/my/my.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<!-- 头部信息Start -->
@@ -665,8 +665,9 @@
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
 
-	page {
+	.page {
 		background-color: #EEF1F7;
+		padding-bottom: 10px;
 	}
 
 	.headers {

+ 34 - 12
pages/register/orderissuer.vue

@@ -19,12 +19,23 @@
 				<view class="phone d-flex">
 					<image src="../../static/image/login/name.png" mode="" style="width: 18px;height: 18px;">
 					</image>
-					<input placeholder="请输入姓名" v-model="name" />
+					<input placeholder="请输入真实姓名" v-model="name" />
+				</view>
+				<view class="code d-flex">
+					<image src="../../static/image/login/yanzhengma.png" mode="" style="width: 18px;height: 18px;">
+					</image>
+					<input placeholder="请输入验证码" v-model="code" maxlength="4" style="padding-right: 200rpx;" />
+					<view class="d-flex a-center j-center login-font-color yanzhengma" @tap="getCheckNum">
+						<view class="d-flex a-center j-center"
+							:class="!codetime?'yanzhengma1 text-color':'yanzhengma2'">
+							{{!codetime?'获取验证码':codetime+' s'}}
+						</view>
+					</view>
 				</view>
 				<view class="password d-flex">
 					<image src="../../static/image/login/mima.png" mode="" style="width: 18px;height: 18px;">
 					</image>
-					<input placeholder="请输入密码" v-model="password" :password='isHidePassword' maxlength="15"
+					<input placeholder="密码" v-model="password" :password='isHidePassword' maxlength="15"
 						style="padding-right: 200rpx;" />
 					<view class=" position-absolute top-0 right-0 d-flex a-center j-center"
 						style="width: 200rpx;height: 100%;">
@@ -33,16 +44,16 @@
 							@tap="isHidePassword = !isHidePassword" mode="" style="width: 18px;height: 18px;">
 					</view>
 				</view>
-
-				<view class="code d-flex">
-					<image src="../../static/image/login/yanzhengma.png" mode="" style="width: 18px;height: 18px;">
+				<view class="password d-flex">
+					<image src="../../static/image/login/mima.png" mode="" style="width: 18px;height: 18px;">
 					</image>
-					<input placeholder="请输入验证码" v-model="code" maxlength="4" style="padding-right: 200rpx;" />
-					<view class="d-flex a-center j-center login-font-color yanzhengma" @tap="getCheckNum">
-						<view class="d-flex a-center j-center"
-							:class="!codetime?'yanzhengma1 text-color':'yanzhengma2'">
-							{{!codetime?'获取验证码':codetime+' s'}}
-						</view>
+					<input placeholder="确认新密码" v-model="confirmPassword" :password='isHidePasswords' maxlength="15"
+						style="padding-right: 200rpx;" />
+					<view class=" position-absolute top-0 right-0 d-flex a-center j-center"
+						style="width: 200rpx;height: 100%;">
+						<image
+							:src="isHidePasswords?'../../static/image/login/biyan.png':'../../static/image/login/zhengyan.png'"
+							@tap="isHidePasswords = !isHidePasswords" mode="" style="width: 18px;height: 18px;">
 					</view>
 				</view>
 			</view>
@@ -97,8 +108,10 @@
 				identity: '',
 				phone: "",
 				password: "",
+				confirmPassword: "",
 				code: "",
 				isHidePassword: true,
+				isHidePasswords: true,
 				disabled: true,
 				loading: false,
 
@@ -161,6 +174,9 @@
 			password(val) {
 				this.OnBtnChange();
 			},
+			confirmPassword(val) {
+				this.OnBtnChange();
+			},
 			code(val) {
 				this.OnBtnChange();
 			}
@@ -172,7 +188,7 @@
 			},
 			// 改变按钮状态
 			OnBtnChange() {
-				if (this.phone && this.password && this.code && this.name) {
+				if (this.phone && this.password && this.confirmPassword && this.code && this.name) {
 					this.disabled = false;
 					return;
 				}
@@ -254,6 +270,12 @@
 						icon: 'none'
 					});
 				}
+				if (this.confirmPassword !== this.password) {
+					return uni.showToast({
+						title: '两次密码输入不一致',
+						icon: 'none'
+					});
+				}
 				if (!this.checked) {
 					return this.$refs.uToast.show({
 						title: '请阅读后勾选并同意《个人信息授权示范性条款》',

+ 35 - 11
pages/register/register.vue

@@ -21,10 +21,21 @@
 					</image>
 					<input placeholder="请输入真实姓名" v-model="name" />
 				</view>
+				<view class="code d-flex">
+					<image src="../../static/image/login/yanzhengma.png" mode="" style="width: 18px;height: 18px;">
+					</image>
+					<input placeholder="请输入验证码" v-model="code" maxlength="4" style="padding-right: 200rpx;" />
+					<view class="d-flex a-center j-center login-font-color yanzhengma" @tap="getCheckNum">
+						<view class="d-flex a-center j-center"
+							:class="!codetime?'yanzhengma1 text-color':'yanzhengma2'">
+							{{!codetime?'获取验证码':codetime+' s'}}
+						</view>
+					</view>
+				</view>
 				<view class="password d-flex">
 					<image src="../../static/image/login/mima.png" mode="" style="width: 18px;height: 18px;">
 					</image>
-					<input placeholder="请输入密码" v-model="password" :password='isHidePassword' maxlength="15"
+					<input placeholder="密码" v-model="password" :password='isHidePassword' maxlength="15"
 						style="padding-right: 200rpx;" />
 					<view class=" position-absolute top-0 right-0 d-flex a-center j-center"
 						style="width: 200rpx;height: 100%;">
@@ -33,19 +44,21 @@
 							@tap="isHidePassword = !isHidePassword" mode="" style="width: 18px;height: 18px;">
 					</view>
 				</view>
-				<view class="code d-flex">
-					<image src="../../static/image/login/yanzhengma.png" mode="" style="width: 18px;height: 18px;">
+				<view class="password d-flex">
+					<image src="../../static/image/login/mima.png" mode="" style="width: 18px;height: 18px;">
 					</image>
-					<input placeholder="请输入验证码" v-model="code" maxlength="4" style="padding-right: 200rpx;" />
-					<view class="d-flex a-center j-center login-font-color yanzhengma" @tap="getCheckNum">
-						<view class="d-flex a-center j-center"
-							:class="!codetime?'yanzhengma1 text-color':'yanzhengma2'">
-							{{!codetime?'获取验证码':codetime+' s'}}
-						</view>
+					<input placeholder="确认新密码" v-model="confirmPassword" :password='isHidePasswords' maxlength="15"
+						style="padding-right: 200rpx;" />
+					<view class=" position-absolute top-0 right-0 d-flex a-center j-center"
+						style="width: 200rpx;height: 100%;">
+						<image
+							:src="isHidePasswords?'../../static/image/login/biyan.png':'../../static/image/login/zhengyan.png'"
+							@tap="isHidePasswords = !isHidePasswords" mode="" style="width: 18px;height: 18px;">
 					</view>
 				</view>
 			</view>
-			<view class="mx-3 mt-3" v-if="showRecommend">
+			<!-- <view class="mx-3 mt-3" v-if="showRecommend"> -->
+			<view class="mx-3 mt-3">
 				<view class=" mas-title dis j-start a-c">
 					<image src="../../static/image/login/1.png" mode=""
 						style="width: 18px;height: 18px;margin-right: 10px;">
@@ -91,8 +104,10 @@
 				name: "",
 				phone: "",
 				password: "",
+				confirmPassword: "",
 				code: "",
 				isHidePassword: true,
+				isHidePasswords: true,
 				disabled: true,
 				loading: false,
 
@@ -154,6 +169,9 @@
 			password(val) {
 				this.OnBtnChange();
 			},
+			confirmPassword(val) {
+				this.OnBtnChange();
+			},
 			code(val) {
 				this.OnBtnChange();
 			}
@@ -165,7 +183,7 @@
 			},
 			// 改变按钮状态
 			OnBtnChange() {
-				if (this.phone && this.password && this.code && this.name) {
+				if (this.phone && this.password && this.confirmPassword && this.code && this.name) {
 					this.disabled = false;
 					return;
 				}
@@ -242,6 +260,12 @@
 						icon: 'none'
 					});
 				}
+				if (this.confirmPassword !== this.password) {
+					return uni.showToast({
+						title: '两次密码输入不一致',
+						icon: 'none'
+					});
+				}
 				// 请求服务器,发送验证码
 				let res = await this.$http.post('/user/agentRegist', {
 					"name": this.name,

+ 1 - 0
pages/set/set.vue

@@ -204,6 +204,7 @@
 				}
 			},
 			zhifubaoMsg(res) {
+				console.log(res);
 				if (res.code == '200') {
 					uni.showToast({
 						title: res.msg,

+ 2 - 2
pages/tools/addStaff/addStaff.vue

@@ -49,9 +49,9 @@
 					<view class="qodeurl dis j-c a-c">
 						<text>{{Downloadurl}}</text>
 					</view>
-					<view class="btn mt-4" @click="downloadUrl(Downloadurl)">
+					<!-- 	<view class="btn mt-4" @click="downloadUrl(Downloadurl)">
 						<text>复制链接</text>
-					</view>
+					</view> -->
 					<view class="tioop dis a-c j-c">
 						<text>下载APP,请点击复制链接后发送给好友,然后使用浏览器访问。</text>
 					</view>

+ 2 - 2
pages/tools/addStaff/authentication.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 
@@ -212,7 +212,7 @@
 		}
 	}
 
-	page {
+	.page {
 		background-color: #F8FAFE;
 	}
 

+ 2 - 1
pages/tools/addStaff/authenticationSearch.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 
@@ -155,6 +155,7 @@
 <style lang="scss" scoped>
 	page {
 		background-color: #F8FAFE;
+		height: 100%;
 	}
 
 	.active {

+ 3 - 3
pages/tools/addStaff/authenticationdetails.vue

@@ -1,6 +1,5 @@
 <template>
-	<view>
-
+	<view class="page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<service-widget @btnClick="btn_click"></service-widget>
@@ -168,9 +167,10 @@
 </script>
 
 <style lang="scss" scoped>
-	page {
+	.page {
 		background-color: #F8FAFE;
 		padding: 16px;
+		height: 100%;
 	}
 
 	.search {

+ 3 - 2
pages/tools/addStaff/employeeAdditionCount.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="page">
 		<view class="headers ">
 			<view class="header">
 				<view class="dis a-c j-start ">
@@ -262,8 +262,9 @@
 		.u-subsection {}
 	}
 
-	page {
+	.page {
 		background-color: #F7F7F7;
+		height: 100%;
 	}
 
 	.headers {

BIN
static/image/index/ad-img/ad.png


BIN
static/image/index/ad-img/ad1.png


BIN
static/image/index/ad-img/ad2.png


BIN
static/image/index/ad-img/ad3.png


BIN
static/image/index/category-img/1.png


BIN
static/image/index/category-img/10.png


BIN
static/image/index/category-img/2.png


BIN
static/image/index/category-img/3.png


BIN
static/image/index/category-img/4.png


BIN
static/image/index/category-img/5.png


BIN
static/image/index/category-img/6.png


BIN
static/image/index/category-img/7.png


BIN
static/image/index/category-img/8.png


BIN
static/image/index/category-img/9.png


BIN
static/image/index/img/Scan.png


BIN
static/image/index/img/cityicon.png


BIN
static/image/index/img/jiantou.png


BIN
static/image/index/pick-img/1.png


BIN
static/image/index/pick-img/10.png


BIN
static/image/index/pick-img/11.png


BIN
static/image/index/pick-img/12.png


BIN
static/image/index/pick-img/2.png


BIN
static/image/index/pick-img/3.png


BIN
static/image/index/pick-img/4.png


BIN
static/image/index/pick-img/5.png


BIN
static/image/index/pick-img/6.png


BIN
static/image/index/pick-img/7.png


BIN
static/image/index/pick-img/8.png


BIN
static/image/index/pick-img/9.png


BIN
static/image/index/pick-img/bg1.png


BIN
static/image/index/pick-img/bg2.png


BIN
static/image/index/pick-img/loding.png