Jelajahi Sumber

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-app into deploy

1004749546@qq.com 4 tahun lalu
induk
melakukan
543f755a31

+ 1 - 1
pages.json

@@ -47,7 +47,7 @@
 			"path": "pages/searchPage/searchPage",
 			"style": {
 				"navigationStyle": "custom", // 隐藏系统导航栏
-				"navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
+				"navigationBarTextStyle": "black" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
 			}
 		},
 		{

+ 1 - 1
pages/login/apply-trial.vue

@@ -39,7 +39,7 @@
 			<checkbox-group @change="authuserChange">
 				<label>
 					<checkbox value="true" :checked="isAuthuserYs" class="login-form-checkbox" />
-					注册代表同意<text @click="toYsPage()">章鱼车管家用户隐私政策</text>
+					注册代表同意<text @click="toYsPage()">智能巡店用户隐私政策</text>
 				</label>
 			</checkbox-group>
 		</view>

+ 2 - 2
pages/login/login.scss

@@ -5,8 +5,8 @@
 	box-sizing: border-box;
 	.logo{
 		display: block;
-		width: 300upx;
-		height: 106upx;
+		width: 144upx;
+		height: 144upx;
 		padding-top: 200upx;
 		margin: 0 auto;
 	}

+ 3 - 4
pages/login/login.vue

@@ -4,11 +4,11 @@
 		<image src="../../static/logo.png" class="logo"></image>
 		<form class="login-form" @submit="formSubmit">
 			<view class="form-item">
-				<uni-font-icons size="20" color="#999" type="icon-yonghuming"></uni-font-icons>
+				<u-icon size="40" color="#999" name="account-fill"></u-icon>
 				<input v-model="form.username" class="item-inp" name="username" type="number" maxlength="11" placeholder="请输入用户名" />
 			</view>
 			<view class="form-item">
-				<uni-font-icons size="20" color="#999" type="icon-mima"></uni-font-icons>
+				<u-icon size="40" color="#999" name="lock-fill"></u-icon>
 				<input v-model="form.password" class="item-inp" name="password" password type="text" maxlength="12" placeholder="请输入密码" />
 			</view>
 			<view class="flex-box" style="margin-top: 60upx;">
@@ -31,8 +31,7 @@
 			<checkbox-group @change="authuserChange">
 				<label>
 					<checkbox value="true" :checked="isAuthuserYs" class="login-form-checkbox" />
-					登录代表同意
-					<text @click="toYsPage()">章鱼车管家用户协议及隐私保护政策</text>
+					登录代表同意<text @click="toYsPage()">智能巡店用户协议及隐私保护政策</text>
 				</label>
 			</checkbox-group>
 		</view>

+ 1 - 1
pages/login/userAuthYs.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="article">
-		<view>章鱼车管家尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务,本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外,在未征得您事先许可的情况下,本应用不会将这些信息对外披露或向第三方提供。</view>
+		<view>智能巡店尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务,本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外,在未征得您事先许可的情况下,本应用不会将这些信息对外披露或向第三方提供。</view>
 		<view>本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时,即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。</view>
 		<view>
 			<p>适用范围</p>

+ 25 - 21
pages/organization/organization.vue

@@ -1,22 +1,19 @@
 <template>
 	<view class="organization-wrap">
-		<u-sticky>
-			<!-- 组织结构根节点 -->
-			<view class="organization-root-tit">
-				<view class="structure-con" v-for="(item,index) in nowStructure" :key="index">
-					<text class="structure-name" @click="checkedStructure(index)">{{item}}</text>
-					<u-icon class="structure-icon" name="arrow-right" color="#999" size="28"></u-icon>
-				</view>
-				
+		<!-- 组织结构根节点 -->
+		<view class="organization-root-tit">
+			<view class="structure-con" v-for="(item,index) in nowStructure" :key="index">
+				<text class="structure-name" @click="checkedStructure(index)">{{item}}</text>
+				<u-icon class="structure-icon" name="arrow-right" color="#999" size="28"></u-icon>
 			</view>
-			<!-- 组织结构子节点 -->
-			<view class="organization-node-con">
-				<view class="organization-node-item" v-for="(item, index) in organizationNowList" :key="index" @click="clickOrganization(item, index)">
-					<text class="organization-node-item-name">{{item.name}}</text>
-					<u-icon class="organization-node-item-icon" name="arrow-right" color="#999" size="28"></u-icon>
-				</view>
+		</view>
+		<!-- 组织结构子节点 -->
+		<view class="organization-node-con">
+			<view class="organization-node-item" v-for="(item, index) in organizationNowList" :key="index" @click="clickOrganization(item, index)">
+				<text class="organization-node-item-name">{{item.name}}</text>
+				<u-icon class="organization-node-item-icon" name="arrow-right" color="#999" size="28"></u-icon>
 			</view>
-		</u-sticky>
+		</view>
 		<!-- 门店列表 -->
 		<view class="list-con">
 			<view class="list-tit">门店列表</view>
@@ -173,16 +170,23 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	page {
 		background-color: #f8f8f8;
 		height: calc(100vh - 44px);
+		position: relative;
 	}
 	.organization-wrap{
+		padding-top: 98upx;
 		.organization-root-tit{
+			position: fixed;
+			left: 0;
+			top: 0;
+			width: 100%;
 			padding: 20upx 30upx;
 			background-color: #fff;
 			border-bottom: 20upx solid #f8f8f8;
+			z-index: 1;
 			.structure-con{
 				display: inline-block;
 				.structure-name{
@@ -199,7 +203,7 @@
 			.organization-node-item{
 				display: flex;
 				padding: 20upx 0;
-				border-bottom: 1upx dashed #f8f8f8;
+				border-bottom: 1px solid #f8f8f8;
 				&-name{
 					flex-grow: 1;
 				}
@@ -210,20 +214,20 @@
 		}
 		// 门店列表
 		.list-con{
-			background-color: #fff;
-			margin-top: 20upx;
 			.list-tit{
 				padding: 20upx 30upx;
 				border-bottom: 1upx solid #f8f8f8;
 			}
 			.listData-con{
 				padding: 0 30upx;
+				box-sizing: border-box;
 				.listData-item{
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					padding: 20upx 0;
-					border-bottom: 1upx dashed #f8f8f8;
+					padding: 20upx;
+					border-bottom: 1px solid #f8f8f8;
+					background-color: #fff;
 					&-l{
 						flex-grow: 1;
 						padding-right: 10upx;

+ 1 - 1
pages/searchPage/searchPage.vue

@@ -3,7 +3,7 @@
 		<!-- 自定义标题 -->
 		<u-navbar :is-back="false" :border-bottom="false" id="navbar">
 			<view class="slot-wrap">
-				<u-search class="left-icon" shape="square" placeholder="请输入门店名称搜索" v-model="keyword" action-text="取消" @change="change" @search="search" @custom="custom"></u-search>
+				<u-search class="left-icon" :focus="true" shape="square" placeholder="请输入门店名称搜索" v-model="keyword" action-text="取消" @change="change" @search="search" @custom="custom"></u-search>
 			</view>
 		</u-navbar>
 		<!-- 列表数据 -->

+ 11 - 1
pages/signIn/signIn.vue

@@ -61,9 +61,18 @@ export default {
 				geocode: true,
 				success: function(res) {
 					console.log(res);
-					// _this.location = res.address.province + res.address.city + res.address.district + res.address.street + res.address.streetNum +'靠近' + res.address.poiName
+					_this.location = res.address.province + res.address.city + res.address.district + res.address.street + res.address.streetNum +'靠近' + res.address.poiName
 					// console.log(_this.location, '城市编码 ', res.address.cityCode)
 					_this.position = res;
+				},
+				fail: function(error){
+					console.log(error)
+					if(JSON.parse(error.errMsg.replace('getLocation:fail ','')).message){
+						uni.showToast({
+							icon: 'none',
+							title: JSON.parse(error.errMsg.replace('getLocation:fail ','')).message
+						})
+					}
 				}
 			});
 		},
@@ -142,6 +151,7 @@ page {
 }
 .signIn-wrap {
 	height: 100%;
+	background-color: #f8f8f8;
 	.module-con {
 		padding: 0 30upx 20upx;
 		.info-main {

+ 1 - 1
pages/siteInspection/siteInspection.vue

@@ -39,7 +39,7 @@
 		data(){
 			return{
 				queryValue: '',
-				location: '',
+				location: '陕西省西安市雁塔区丈八东路卡的时间段卡萨34345的想法双方都第三方的',
 				noDataText: '未查找到附近门店',  //  列表请求状态提示语
 				status: 'loadmore',  //  加载中状态
 				listdata: [],  //  列表数据

+ 2 - 2
pages/userCenter/aboutUs.vue

@@ -4,11 +4,11 @@
 			<view class="logoBorder">
 				<image class="logoImg" src="/static/logo.png"></image>
 			</view>
-			<view>章鱼车管家信息管理平台</view>
+			<view>智能巡店信息管理平台</view>
 		</view>
 		<view class="textContent">
 			<view>陕西山海高科信息技术有限公司专注于汽车服务行业,成立于古城西安,是一家以先进云端互联网技术驱动的公司,致力于通过saas云门店管理系统为汽车综修厂、社区店以及大量的中小门店赋能。以解决汽车维修、美容、保养等业务中发生的一系列问题。</view>
-			<view>章鱼车管家设计了一套完善的降本增效方案,在引流获客、员工提成、营销活动、财务报表、数据分析等方面获得客户一致认可。</view>
+			<view>智能巡店设计了一套完善的降本增效方案,在引流获客、员工提成、营销活动、财务报表、数据分析等方面获得客户一致认可。</view>
 			<view>山海高科将通过持续的科技成果转化为推动汽后市场发展提供动力,帮助更多服务终端、供应链企业、主机厂商、银行以及保险等汽车后市场参与方转型升级。</view>
 		</view>
 	</view>

+ 2 - 2
pages/userCenter/userCenter.vue

@@ -65,14 +65,14 @@ export default {
 					auth: true,
 					url: '/pages/userCenter/aboutUs',
 					icon: 'guanyuwomen1',
-					color: '#00aa00'
+					color: '#00aaff'
 				},
 				{
 					title: '用户协议及隐私保护政策',
 					auth: true,
 					url: '/pages/login/userAuthYs',
 					icon: 'xieyi1',
-					color: '#8067ff'
+					color: '#07b584'
 				},
 				{
 					title: '版本检查',

+ 21 - 23
pages/videoShopTour/videoShopTour.vue

@@ -1,23 +1,21 @@
 <template>
 	<view class="videoShopTour-wrap">
-		<u-sticky>
-			<!-- 搜索方式 -->
-			<u-grid :col="2" class="search-type-con" hover-class="none">
-				<u-grid-item class="search-module" @click="goSearch">
-					<u-icon class="search-icon" name="xundianguanli" custom-prefix="xd-icon" size="80" color="#2b85e4"></u-icon>
-					<view class="search-txt">按门店名称查询</view>
-				</u-grid-item>
-				<u-grid-item class="search-module" @click="goOrgSearch">
-					<u-icon class="search-icon" name="zuzhijigou" custom-prefix="xd-icon" size="80" color="#19be6b"></u-icon>
-					<view class="search-txt">按组织机构查询</view>
-				</u-grid-item>
-			</u-grid>
-		</u-sticky>
+		<!-- 搜索方式 -->
+		<u-grid :col="2" class="search-type-con" hover-class="none">
+			<u-grid-item class="search-module" @click="goSearch">
+				<u-icon class="search-icon" name="xundianguanli" custom-prefix="xd-icon" size="80" color="#2b85e4"></u-icon>
+				<view class="search-txt">按门店名称查询</view>
+			</u-grid-item>
+			<u-grid-item class="search-module" @click="goOrgSearch">
+				<u-icon class="search-icon" name="zuzhijigou" custom-prefix="xd-icon" size="80" color="#19be6b"></u-icon>
+				<view class="search-txt">按组织机构查询</view>
+			</u-grid-item>
+		</u-grid>
 		<!-- 门店列表 -->
 		<view class="list-con">
 			<view class="list-tit">门店列表</view>
 			<!-- 列表数据 -->
-			<view class="listData-con">
+			<scroll-view class="listData-con" scroll-y>
 				<view class="listData-item" v-for="(item, index) in list" :key="item.id" @click="goPage(item)">
 					<view class="listData-item-l">
 						<u-icon class="listData-item-l-icon" name="mendian" custom-prefix="xd-icon" size="40" color="#888"></u-icon>
@@ -28,7 +26,7 @@
 					</view>
 				</view>
 				<u-empty :text="noDataText" img-width="120" v-if="list.length == 0 && status != 'loading'" :margin-top="220" style="padding-bottom: 120px;" mode="list"></u-empty>
-			</view>
+			</scroll-view>
 		</view>
 	</view>
 </template>
@@ -115,12 +113,13 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	page {
 		background-color: #f8f8f8;
 		height: calc(100vh - 44px);
 	}
 	.videoShopTour-wrap{
+		height: 100%;
 		// 搜索方式
 		.search-type-con{
 			.search-module{
@@ -132,23 +131,22 @@
 		}
 		// 门店列表
 		.list-con{
-			background-color: #fff;
-			margin-top: 20upx;
+			margin-top: 10upx;
 			.list-tit{
 				padding: 20upx 30upx;
 				border-bottom: 1upx solid #f8f8f8;
 			}
 			.listData-con{
 				padding: 0 30upx;
+				height: calc(100vh - 165px);
+				box-sizing: border-box;
 				.listData-item{
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					padding: 20upx 0;
-					border-bottom: 1upx dashed #f8f8f8;
-					&:active{
-						background: #F8F8F8;
-					}
+					padding: 20upx;
+					border-bottom: 1px solid #F8F8F8;
+					background-color: #fff;
 					&-l{
 						flex-grow: 1;
 						padding-right: 10upx;

TEMPAT SAMPAH
static/logo.png


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/app-plus/app-config-service.js


+ 1 - 2
unpackage/dist/dev/app-plus/app-config.js

@@ -10,7 +10,7 @@
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
 /******/ 		for(;i < chunkIds.length; i++) {
 /******/ 			chunkId = chunkIds[i];
-/******/ 			if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
+/******/ 			if(installedChunks[chunkId]) {
 /******/ 				resolves.push(installedChunks[chunkId][0]);
 /******/ 			}
 /******/ 			installedChunks[chunkId] = 0;
@@ -46,7 +46,6 @@
 /******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
 /******/ 			}
 /******/ 		}
-/******/
 /******/ 		return result;
 /******/ 	}
 /******/

File diff ditekan karena terlalu besar
+ 3 - 3
unpackage/dist/dev/app-plus/app-service.js


File diff ditekan karena terlalu besar
+ 16 - 16
unpackage/dist/dev/app-plus/app-view.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


TEMPAT SAMPAH
unpackage/dist/dev/app-plus/static/logo.png


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/app-plus/view.umd.min.js


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini