Browse Source

Merge branch 'deploy_qbyc' of chelingzhu-web/storeCheck-app into master

lilei 4 years ago
parent
commit
42e214f712
100 changed files with 651 additions and 528 deletions
  1. 5 10
      App.vue
  2. 34 0
      config/index.js
  3. 11 0
      hybrid/html/css/styles.css
  4. 17 4
      hybrid/html/ddvideo.html
  5. 23 7
      hybrid/html/video.html
  6. 16 1
      main.js
  7. 123 0
      manifest-clz.json
  8. 53 8
      manifest.json
  9. 323 0
      pages-clz.json
  10. 8 8
      pages.json
  11. 3 1
      pages/index/index.vue
  12. 3 4
      pages/login/forget-pass.vue
  13. 8 6
      pages/login/login.vue
  14. 1 1
      pages/login/userAuthYs.vue
  15. 1 1
      pages/myShopTour/myShopTour.vue
  16. 1 1
      pages/myShopTour/searchModal.vue
  17. 1 1
      pages/shopTour/shopTour.vue
  18. 1 1
      pages/shopTourCompleted/shopTourCompleted.vue
  19. 1 1
      pages/shopTourOver/shopTourOver.vue
  20. 3 3
      pages/shopTourRecord/screenModule.vue
  21. 1 1
      pages/signIn/signIn.vue
  22. 1 1
      pages/spotCheckCenter/spotCheckResult.vue
  23. 1 1
      pages/spotCheckCenter/spotChecking.vue
  24. 1 1
      pages/spotCheckConfigure/addSpotCheck.vue
  25. 1 1
      pages/toDoList/addBacklog.vue
  26. 1 1
      pages/toDoList/searchModal.vue
  27. 1 1
      pages/toDoList/toDoList.vue
  28. 6 8
      pages/userCenter/aboutUs.vue
  29. 1 1
      pages/userCenter/changePwd.vue
  30. 1 1
      pages/userCenter/userCenter.vue
  31. BIN
      static/logo.png
  32. BIN
      static/pt.png
  33. BIN
      static/qiubxd/logo.png
  34. 0 0
      static/qiubxd/navIcon/djpz.png
  35. 0 0
      static/qiubxd/navIcon/djzx.png
  36. 0 0
      static/qiubxd/navIcon/spxd.png
  37. 0 0
      static/qiubxd/navIcon/wdxd.png
  38. 0 0
      static/qiubxd/navIcon/xcjc.png
  39. 0 0
      static/qiubxd/navIcon/zdjl.png
  40. BIN
      static/qiubxd/tabbar/home-active.png
  41. 0 0
      static/qiubxd/tabbar/home.png
  42. BIN
      static/qiubxd/tabbar/user-active.png
  43. 0 0
      static/qiubxd/tabbar/user.png
  44. BIN
      static/qiubxd/tabbar/work-active.png
  45. 0 0
      static/qiubxd/tabbar/work.png
  46. BIN
      static/zyuxd/logo.png
  47. BIN
      static/zyuxd/navIcon/djpz.png
  48. BIN
      static/zyuxd/navIcon/djzx.png
  49. BIN
      static/zyuxd/navIcon/spxd.png
  50. BIN
      static/zyuxd/navIcon/wdxd.png
  51. BIN
      static/zyuxd/navIcon/xcjc.png
  52. BIN
      static/zyuxd/navIcon/zdjl.png
  53. 0 0
      static/zyuxd/tabbar/home-active.png
  54. 0 0
      static/zyuxd/tabbar/home.png
  55. 0 0
      static/zyuxd/tabbar/user-active.png
  56. 0 0
      static/zyuxd/tabbar/user.png
  57. 0 0
      static/zyuxd/tabbar/work-active.png
  58. 0 0
      static/zyuxd/tabbar/work.png
  59. 0 0
      unpackage/dist/dev/.automator/app-plus/.automator.json
  60. 0 0
      unpackage/dist/dev/app-plus/__uniappchooselocation.js
  61. 0 0
      unpackage/dist/dev/app-plus/__uniappes6.js
  62. 0 0
      unpackage/dist/dev/app-plus/__uniappopenlocation.js
  63. 0 0
      unpackage/dist/dev/app-plus/__uniapppicker.js
  64. 0 6
      unpackage/dist/dev/app-plus/__uniappquill.js
  65. 0 0
      unpackage/dist/dev/app-plus/__uniappquillimageresize.js
  66. 0 0
      unpackage/dist/dev/app-plus/__uniappscan.js
  67. BIN
      unpackage/dist/dev/app-plus/__uniappsuccess.png
  68. 0 25
      unpackage/dist/dev/app-plus/__uniappview.html
  69. 0 3
      unpackage/dist/dev/app-plus/app-config-service.js
  70. 0 154
      unpackage/dist/dev/app-plus/app-config.js
  71. 0 9
      unpackage/dist/dev/app-plus/app-service.js
  72. 0 229
      unpackage/dist/dev/app-plus/app-view.js
  73. 0 1
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/aliplayer-h5-min.js
  74. 0 0
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/aliplayer-min.css
  75. 0 1
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/aliplayer-min.js
  76. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/bigplay.png
  77. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/cc.png
  78. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/dragcursor.png
  79. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/dragcursorhover.png
  80. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/fullscreen.png
  81. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/pauseanimation.png
  82. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/playanimation.png
  83. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/setting.png
  84. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/smallpause.png
  85. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/smallplay.png
  86. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/smallscreen.png
  87. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/snapshot.png
  88. BIN
      unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/volume.png
  89. 0 7
      unpackage/dist/dev/app-plus/hybrid/html/antd/antd.min.css
  90. 0 1
      unpackage/dist/dev/app-plus/hybrid/html/antd/antd.min.js
  91. 0 0
      unpackage/dist/dev/app-plus/hybrid/html/imgEdit/ped.min.js
  92. 0 12
      unpackage/dist/dev/app-plus/hybrid/html/js/less.min.js
  93. 0 0
      unpackage/dist/dev/app-plus/hybrid/html/js/moment-with-locales.min.js
  94. 0 0
      unpackage/dist/dev/app-plus/hybrid/html/js/moment.min.js
  95. 0 0
      unpackage/dist/dev/app-plus/hybrid/html/js/uni.webview.1.5.2.js
  96. 0 5
      unpackage/dist/dev/app-plus/hybrid/html/js/vue@2.6.11
  97. BIN
      unpackage/dist/dev/app-plus/hybrid/html/static/icons/close.png
  98. BIN
      unpackage/dist/dev/app-plus/hybrid/html/static/icons/down.png
  99. BIN
      unpackage/dist/dev/app-plus/hybrid/html/static/icons/kz-mini.png
  100. BIN
      unpackage/dist/dev/app-plus/hybrid/html/static/icons/left.png

+ 5 - 10
App.vue

@@ -1,18 +1,12 @@
 <script>
-	const uat_URL = 'https://aitour.test.zyucgj.com/at-employee/' // 预发布
-	// const uat_URL = 'http://192.168.16.100:9102/at-employee/' // 本地
-	const pro_URL = 'https://aitour.zyucgj.com/at-employee/'  // 生产
-	const buildType = 0 // 打包环境对应类型,1 生产 0 预发布
-	const buildURL = buildType ? pro_URL : uat_URL // 打包后实际对应的url
-	const envText = ['预发布环境','生产环境']
-	const envTips = process.env.NODE_ENV == 'development' ? envText[0] : envText[buildType]
 	export default {
 		globalData: {  
-			baseUrl: process.env.NODE_ENV == 'development' ? uat_URL : buildURL,
+			baseUrl: '',
 			token: '',
 			version: '', // 当前版本号
-			buildType: buildType,
-			envTips: envTips
+			buildType: 'pro', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
+			envTips: '', // 环境文字提示
+			theme: 'qiubxd', // app 主题类型, zyuxd 章鱼巡店 ,qiubxd 丘比巡店
 		},
 		mounted() {
 			// 非V3模式
@@ -22,6 +16,7 @@
 				// V3模式
 				getApp({allowDefault: true}).globalData.token = this.$store.state.vuex_token
 			}
+			this.$config('init')
 		},
 		onLaunch: function() {
 			console.log('App onLaunch')

+ 34 - 0
config/index.js

@@ -0,0 +1,34 @@
+// 主题配置信息
+const getConfig = (theme) => {
+	const config = {
+		// 章鱼巡店
+		"zyuxd":{
+			themePath: 'zyuxd',
+			pro_URL: 'https://aitour.zyucgj.com/at-employee/', // 生产地址
+			uat_URL: 'https://aitour.test.zyucgj.com/at-employee/', // 预发布地址
+			dev_URL: 'http://192.168.16.100:9102/at-employee/', // 本地地址
+			appName: '智能巡店系统', // app 名称
+			company: '陕西山海高科信息技术有限公司',
+			primaryColors: '#55aaff', // 主色调
+			buttonColors: '#3399ff', // 按钮主色调
+			fixedButtonColors: '#0099FF', // 浮动按钮色调
+			topBarBackground: '#3399ff', // 主页顶部栏渐变色
+		},
+		// 丘比养车巡店
+		"qiubxd":{
+			themePath: 'qiubxd',
+			pro_URL: 'https://aitour.qiubcar.com/at-employee/', // 生产地址
+			uat_URL: 'https://aitour.test.qiubcar.com/at-employee/', // 预发布地址
+			dev_URL: 'http://192.168.16.100:9102/at-employee/', // 本地地址
+			appName: '智能巡店系统', // app 名称
+			company: '成都丘比象科技有限公司',
+			primaryColors: '#f8a240', // 主色调
+			buttonColors: '#ff6600', // 按钮主色调
+			fixedButtonColors: '#FF9933', // 浮动按钮色调
+			topBarBackground: '#282828', // 主页顶部栏渐变色
+		}
+	}
+	return config[theme]
+}
+
+export default getConfig

+ 11 - 0
hybrid/html/css/styles.css

@@ -173,6 +173,17 @@ body {
 	line-height: 240px;
 	text-align: center;
 }
+.videoPlay .videoloading{
+	position: absolute;
+	width: 100px;
+	height: 100px;
+	margin-left: -50px;
+	margin-top: -50px;
+	top: 50%;
+	left: 50%;
+	z-index: 8888;
+	text-align: center;
+}
 .videoPlay .control-yt, .videoPlay .control-yt-close {
   position: absolute;
   right: 15px;

+ 17 - 4
hybrid/html/ddvideo.html

@@ -30,6 +30,10 @@
 				<div v-show="showYtbtns" @click="kzYt(2)" class="ytBtns yt-right"></div>
 				<div v-show="showYtbtns" @click="kzYt(3)" class="ytBtns yt-top"></div>
 				<div v-show="showYtbtns" @click="kzYt(4)" class="ytBtns yt-bottom"></div>
+				<!-- 加载条 -->
+				<div v-if="showVideoLoading" class="videoloading">
+					<a-spin size="large" tip="加载中..."/>
+				</div>
 				<!-- 播放器 -->
 				<div class="prism-player" id="player-con"></div>
 			</div>
@@ -160,6 +164,7 @@
 				el: '#app',
 				data: {
 					xdType: 'video', // 巡店类型
+					showVideoLoading: false, // 视频加载进度
 					player: null, // 播放器对象
 					videoStatus: false, // 获取视频失败
 					videoPlayerStatus: '', // 视频播放状态
@@ -232,10 +237,14 @@
 						// 重置播放器
 						this.showYt = false
 						this.showYtbtns = false
+						this.showVideoLoading = true
 						if (this.player) {
-							this.player.dispose()
+							// this.player.dispose()
+							// document.getElementById('player-con').innerHTML = ""
+							this.player.loadByUrl(url)
+						}else{
+							this.videoInit(url)
 						}
-						this.videoInit(url)
 					},
 					// 获取视频地址失败
 					getVideoUrlError(err){
@@ -251,10 +260,11 @@
 							'source': videoSrc,
 							'width': '100%',
 							'height': '240px',
-							'autoplay': false,
+							'autoplay': true,
 							'isLive': true,
 							'rePlay': true,
-							'playsinline': true,
+							'playsinline': false,
+							'showBuffer': true,
 							'preload': true,
 							'language': 'zh-cn',
 							'useH5Prism': true,
@@ -305,11 +315,14 @@
 						})
 						// 控制栏
 						_this.player.on('playing', function() {
+							console.log('playing')
 							// _this.showYt = true
 							_this.videoPlayerStatus = 'playing'
+							_this.showVideoLoading = false
 						})
 						_this.player.on('error', function(e) {
 							console.log(JSON.stringify(e), 'error')
+							_this.player.loadByUrl(videoSrc)
 						})
 						// 全屏时设置横屏
 						_this.player.on('requestFullScreen', function(e) {

+ 23 - 7
hybrid/html/video.html

@@ -30,6 +30,10 @@
 				<div v-show="showYtbtns" @click="kzYt(2)" class="ytBtns yt-right"></div>
 				<div v-show="showYtbtns" @click="kzYt(3)" class="ytBtns yt-top"></div>
 				<div v-show="showYtbtns" @click="kzYt(4)" class="ytBtns yt-bottom"></div>
+				<!-- 加载条 -->
+				<div v-if="showVideoLoading" class="videoloading">
+					<a-spin size="large" tip="加载中..."/>
+				</div>
 				<!-- 播放器 -->
 				<div class="prism-player" id="player-con"></div>
 			</div>
@@ -194,6 +198,7 @@
 				el: '#app',
 				data: {
 					xdType: 'video', // 巡店类型
+					showVideoLoading: false, // 视频加载进度
 					videoStatus: false, // 获取视频失败
 					player: null, // 播放器对象
 					videoPlayerStatus:'',// 视频播放状态
@@ -288,10 +293,14 @@
 						// 重置播放器
 						this.showYt = false
 						this.showYtbtns = false
+						this.showVideoLoading = true
 						if(this.player){
-							this.player.dispose()
+							// this.player.dispose()
+							// document.getElementById('player-con').innerHTML = ""
+							this.player.loadByUrl(url)
+						}else{
+							this.videoInit(url)
 						}
-						this.videoInit(url)
 					},
 					// 获取视频地址失败
 					getVideoUrlError(err){
@@ -307,17 +316,19 @@
 							'source': videoSrc,
 							'width': '100%',
 							'height': '240px',
-							'autoplay': false,
+							'autoplay': true,
 							'isLive': true,
 							'rePlay': true,
-							'playsinline': true,
-							'preload': true,
+							'playsinline': false,
+							'showBuffer': true,
+							'preload': false,
 							'language': 'zh-cn',
 							'useH5Prism': true,
 							'extraInfo': {
 								'crossOrigin': 'anonymous'
 							},
-							'skinLayout': [{
+							'skinLayout': [
+								{
 									'name': 'bigPlayButton',
 									'align': 'cc'
 								},
@@ -328,7 +339,8 @@
 									'y': 0
 								},
 								{
-									'name': 'infoDisplay'
+									'name': 'infoDisplay',
+									'align': 'cc'
 								},
 								{
 									'name': 'controlBar',
@@ -359,13 +371,17 @@
 						}, function(player) {
 							_this.sendMsg('message', 'The player is created')
 						})
+						
 						// 控制栏
 						_this.player.on('playing', function() {
+							console.log('playing')
 							// _this.showYt = true
 							_this.videoPlayerStatus = 'playing'
+							_this.showVideoLoading = false
 						})
 						_this.player.on('error', function(e) {
 							console.log(JSON.stringify(e), 'error')
+							_this.player.loadByUrl(videoSrc)
 						})
 						// 全屏时设置横屏
 						_this.player.on('requestFullScreen', function(e) {

+ 16 - 1
main.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import App from './App'
 import store from '@/store'
-
+import getConfig from '@/config'
 Vue.config.productionTip = false
 App.mpType = 'app'
 
@@ -10,6 +10,21 @@ Vue.use(uView)
 
 let vuexStore = require("@/store/$u.mixin.js")
 Vue.mixin(vuexStore)
+
+// 系统配置
+Vue.prototype.$config = function (key) {
+	const envText = {pro:'生产环境',dev:'开发环境',uat:'预发布环境'}
+	const theme = getApp().globalData.theme
+	const config = getConfig(theme)
+	if(key == 'init'){
+		let buildType = getApp().globalData.buildType
+		let baseUrl = config[buildType+'_URL']
+		getApp().globalData.baseUrl = baseUrl
+		getApp().globalData.envTips = envText[buildType]
+	}
+	return config[key]
+}
+
 /**
  * 权限检查
  */

+ 123 - 0
manifest-clz.json

@@ -0,0 +1,123 @@
+{
+    "name" : "智能巡店",
+    "appid" : "__UNI__BDCA285",
+    "description" : "巡店系统",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "VideoPlayer" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "schemes" : "storeCheck"
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "",
+                        "appkey_android" : ""
+                    }
+                },
+                "maps" : {},
+                "ad" : {}
+            },
+            "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"
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    }
+}

+ 53 - 8
manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "storeCheck-app",
-    "appid" : "__UNI__BDCA285",
-    "description" : "",
-    "versionName" : "1.2.5",
-    "versionCode" : 125,
+    "name" : "智能巡店",
+    "appid" : "__UNI__1A5DA04",
+    "description" : "丘比养车巡店系统",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "VideoPlayer" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -45,10 +47,21 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "schemes" : "qbstoreCheck",
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
+                },
+                "permissionPhoneState" : {
+                    "request" : "none",
+                    "prompt" : "为保证您正常、安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许。"
+                }
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "urltypes" : "qbstoreCheck"
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "geolocation" : {
@@ -60,6 +73,38 @@
                 },
                 "maps" : {},
                 "ad" : {}
+            },
+            "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"
+                    }
+                }
             }
         }
     },

+ 323 - 0
pages-clz.json

@@ -0,0 +1,323 @@
+{
+	"easycom": {
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+	},
+	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/login/login", //  登录
+			"style": {
+				"navigationStyle": "custom", //  是否显示导航栏  default显示,custom不显示
+				"navigationBarTitleText": "登录"
+			}
+		},
+		{
+			"path": "pages/login/apply-trial", //  申请试用
+			"style": {
+				"navigationStyle": "default", //  是否显示导航栏  default显示,custom不显示
+				"navigationBarTitleText": "申请试用"
+			}
+		},
+		{
+			"path": "pages/login/forget-pass", //  忘记密码
+			"style": {
+				"navigationStyle": "default", //  是否显示导航栏  default显示,custom不显示
+				"navigationBarTitleText": "忘记密码"
+			}
+		},
+		{
+			"path": "pages/login/userAuthYs", //  用户隐私政策须知
+			"style": {
+				"navigationStyle": "default", //  是否显示导航栏  default显示,custom不显示
+				"navigationBarTitleText": "用户协议及隐私保护政策"
+			}
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "智能巡店"
+			}
+		},
+		{
+			"path": "pages/videoShopTour/videoShopTour",
+			"style": {
+				"navigationBarTitleText": "视频巡店"
+			}
+		},
+		{
+			"path": "pages/searchPage/searchPage",
+			"style": {
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationBarTextStyle": "black" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
+			}
+		},
+		{
+			"path": "pages/organization/organization",
+			"style": {
+				"navigationBarTitleText": "按组织机构查询"
+			}
+		},
+		{
+			"path": "pages/shopTour/shopTour",
+			"style": {
+				"navigationBarTitleText": "视频巡店",
+				"app-plus": {
+					"bounce": "none", //关闭窗口回弹效果
+					"titleNView": {
+						"buttons": [ //原生标题栏按钮配置,
+							{
+								"text": "\ue610 考评方案", //原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+								"fontSize": 16,
+								"color": "#eee",
+								"width": "120px",
+								"fontSrc": "/static/iconfont/iconfont.ttf"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/evaluatePlan/evaluatePlan",
+			"style": {
+				"navigationBarTitleText": "选择考评方案"
+			}
+		},
+		{
+			"path": "pages/evaluatePlan/planDetail",
+			"style": {
+				"navigationBarTitleText": "考评方案详细"
+			}
+		},
+		{
+			"path": "pages/work/work",
+			"style": {
+				"navigationBarTitleText": "工作台"
+			}
+		},
+		{
+			"path": "pages/siteInspection/siteInspection",
+			"style": {
+				"navigationBarTitleText": "现场巡店"
+			}
+		},
+		{
+			"path": "pages/signIn/signIn",
+			"style": {
+				"navigationBarTitleText": "拍照签到"
+			}
+		},
+		{
+			"path": "pages/shopTourOver/shopTourOver", //  现场巡店结束签字
+			"style": {
+				"navigationBarTitleText": "签字"
+			}
+		},
+		{
+			"path": "pages/shopTourCompleted/shopTourCompleted", //  现场巡店-巡店完成
+			"style": {
+				"navigationBarTitleText": "巡店完成"
+			}
+		},
+		{
+			"path": "pages/myShopTour/myShopTour", //  我的巡店
+			"style": {
+				"navigationBarTitleText": "我的巡店",
+				"app-plus": {
+					"bounce": "none", //关闭窗口回弹效果
+					"titleNView": {
+						"buttons": [ //原生标题栏按钮配置,
+							{
+								"text": "\ue67c 筛选", //原生标题栏增加过滤按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+								"fontSize": 16,
+								"color": "#eee",
+								"width": "80px",
+								"fontSrc": "/static/iconfont/iconfont.ttf"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/shopTourRecord/shopTourRecord", //  巡店记录
+			"style": {
+				"navigationBarTitleText": "巡店记录"
+			}
+		},
+		{
+			"path": "pages/shopTourDetails/shopTourDetails", //  巡店详情
+			"style": {
+				"navigationBarTitleText": "巡店详情"
+			}
+		},
+		{
+			"path": "pages/spotCheckDetails/spotCheckDetails", //  点检详情
+			"style": {
+				"navigationBarTitleText": "点检详情"
+			}
+		},
+		{
+			"path": "pages/spotCheckCenter/spotChecking",
+			"style": {
+				"navigationBarTitleText": "点检中心"
+			}
+		}, {
+			"path": "pages/spotCheckCenter/spotCheckResult",
+			"style": {
+				"navigationBarTitleText": "点检结果"
+			}
+		},
+		{
+			"path" : "pages/userCenter/viewStores",
+			"style" : {
+				"navigationBarTitleText": "可点检门店"
+			}
+		},
+		{
+			"path": "pages/spotCheckConfigure/spotCheckList",
+			"style": {
+				"navigationBarTitleText": "点检任务配置",
+				"titleNView": {
+					"buttons": [
+						{
+							"text": ""
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/spotCheckConfigure/addSpotCheck",
+			"style": {
+				"navigationBarTitleText": "新增点检任务"
+			}
+		},
+		{
+			"path": "pages/spotCheckConfigure/spotCheckDetail/spotCheckDetail",
+			"style": {
+				"navigationBarTitleText": "点检任务详情"
+			}
+		},
+		{
+			"path": "pages/spotCheckConfigure/spotCheckDetail/evaluateItemDetail",
+			"style": {
+				"navigationBarTitleText": "考评指标详情"
+			}
+		},
+		{
+			"path": "pages/spotCheckConfigure/evaluateItem",
+			"style": {
+				"navigationBarTitleText": "考评指标"
+			}
+		},
+		{
+			"path": "pages/spotCheckConfigure/evaluateStore",
+			"style": {
+				"navigationBarTitleText": "考评门店"
+			}
+		},
+		{
+			"path": "pages/userCenter/userCenter",
+			"style": {
+				"navigationBarTitleText": "个人中心"
+			}
+		},
+		{
+			"path": "pages/userCenter/personInfo", //  我的>个人信息
+			"style": {
+				"navigationBarTitleText": "个人信息"
+			}
+		},
+		{
+			"path": "pages/userCenter/aboutUs", //  我的>关于我们
+			"style": {
+				"navigationBarTitleText": "关于我们"
+			}
+		},
+		{
+			"path": "pages/userCenter/changePwd", //  我的>修改密码
+			"style": {
+				"navigationBarTitleText": "修改密码"
+			}
+		},
+		{
+			"path": "pages/toDoList/toDoList", //  待办单 > 待办单列表
+			"style": {
+				"navigationBarTitleText": "待办单",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [
+							{
+								"text": ""
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/toDoList/backlogDetail", //  待办单 > 问题详情
+			"style": {
+				"navigationBarTitleText": "待办单详情"
+			}
+		},
+		{
+			"path": "pages/toDoList/addBacklog", //  待办单 > 创建问题
+			"style": {
+				"navigationBarTitleText": "新增待办单"
+			}
+		},
+		{
+			"path": "pages/toDoList/chooseReceiveUser", //  待办单 > 选择抄送人
+			"style": {
+				"navigationBarTitleText": "选择抄送人"
+			}
+		}
+	    ,{
+            "path" : "pages/spotCheck/spotCheck",
+            "style" : {
+				"navigationBarTitleText": "开始点检"
+			}
+        },
+		{
+			"path": "pages/toDoList/chooseEvaluateItem",
+			"style": {
+				"navigationBarTitleText": "考评指标"
+			}
+		}
+    ],
+	"globalStyle": {
+		"navigationBarTitleText": "智能巡店",
+		"navigationBarTextStyle": "white",
+		"navigationBarBackgroundColor": "#0b6ce0",
+		"backgroundColor": "#F8F8F8",
+		"app-plus": {
+			// 将回弹属性关掉
+			"bounce": "none",
+			"scrollIndicator": "none"
+		}
+	},
+	"tabBar": {
+		"color": "#7A7E83",
+		"selectedColor": "#0b6ce0",
+		"borderStyle": "#eee",
+		"backgroundColor": "#ffffff",
+		"fontSize": "14px",
+		"list": [{
+			"pagePath": "pages/index/index",
+			"iconPath": "static/zyuxd/tabbar/home.png",
+			"selectedIconPath": "static/zyuxd/tabbar/home-active.png",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/work/work",
+			"iconPath": "static/zyuxd/tabbar/work.png",
+			"selectedIconPath": "static/zyuxd/tabbar/work-active.png",
+			"text": "工作台"
+		}, {
+			"pagePath": "pages/userCenter/userCenter",
+			"iconPath": "static/zyuxd/tabbar/user.png",
+			"selectedIconPath": "static/zyuxd/tabbar/user-active.png",
+			"text": "我的"
+		}]
+	}
+}

+ 8 - 8
pages.json

@@ -288,8 +288,8 @@
     ],
 	"globalStyle": {
 		"navigationBarTitleText": "智能巡店",
-		"navigationBarBackgroundColor": "#0b6ce0",
 		"navigationBarTextStyle": "white",
+		"navigationBarBackgroundColor": "#282828",
 		"backgroundColor": "#F8F8F8",
 		"app-plus": {
 			// 将回弹属性关掉
@@ -299,24 +299,24 @@
 	},
 	"tabBar": {
 		"color": "#7A7E83",
-		"selectedColor": "#0b6ce0",
+		"selectedColor": "#f8a240",
 		"borderStyle": "#eee",
 		"backgroundColor": "#ffffff",
 		"fontSize": "14px",
 		"list": [{
 			"pagePath": "pages/index/index",
-			"iconPath": "static/tabbar/home.png",
-			"selectedIconPath": "static/tabbar/home-active.png",
+			"iconPath": "static/qiubxd/tabbar/home.png",
+			"selectedIconPath": "static/qiubxd/tabbar/home-active.png",
 			"text": "首页"
 		}, {
 			"pagePath": "pages/work/work",
-			"iconPath": "static/tabbar/work.png",
-			"selectedIconPath": "static/tabbar/work-active.png",
+			"iconPath": "static/qiubxd/tabbar/work.png",
+			"selectedIconPath": "static/qiubxd/tabbar/work-active.png",
 			"text": "工作台"
 		}, {
 			"pagePath": "pages/userCenter/userCenter",
-			"iconPath": "static/tabbar/user.png",
-			"selectedIconPath": "static/tabbar/user-active.png",
+			"iconPath": "static/qiubxd/tabbar/user.png",
+			"selectedIconPath": "static/qiubxd/tabbar/user-active.png",
 			"text": "我的"
 		}]
 	}

+ 3 - 1
pages/index/index.vue

@@ -115,6 +115,9 @@
 				this.gettoDoData()
 			}
 		},
+		onReady() {
+			let theme = this.$config('themePath')
+		},
 		methods: {
 			// 或某一项字典列表,参数code
 			getLookUpList(code, vuexKey) {
@@ -224,7 +227,6 @@
 
 			.panel-body {
 				padding: 20upx 0;
-
 				.nodata {
 					text-align: center;
 					font-size: 24upx;

+ 3 - 4
pages/login/forget-pass.vue

@@ -7,10 +7,10 @@
 				</view>
 				<view class="form-item">
 					<input v-model="form.verifyCode" class="item-inp" name="verifyCode" type="number" maxlength="6" placeholder="请输入短信验证码" />
-					<button class="getcode-btn" :disabled="isDisable" @click="getCodeValidate">{{nowVal}}</button>
+					<button class="getcode-btn" :style="{background: $config('primaryColors')}" :disabled="isDisable" @click="getCodeValidate">{{nowVal}}</button>
 				</view>
 				<view class="form-btn-con">
-					<button class="form-btn" @click="goStep">下一步</button>
+					<button class="form-btn" :style="{background: $config('buttonColors')}" @click="goStep">下一步</button>
 				</view>
 			</view>
 			<view v-show="state == 1">
@@ -21,7 +21,7 @@
 					<input v-model="form.passwords" class="item-inp" name="passwords" password type="text" maxlength="12" placeholder="请再次输入新密码" />
 				</view>
 				<view class="form-btn-con">
-					<button class="form-btn" form-type="submit">提交</button>
+					<button class="form-btn" :style="{background: $config('buttonColors')}" form-type="submit">提交</button>
 				</view>
 			</view>
 		</form>
@@ -222,7 +222,6 @@
 		padding-top: 300upx;
 	}
 	.getcode-btn {
-		background-color: #298bf2 !important;
 		color: #fff !important;
 		border: none !important;
 	}

+ 8 - 6
pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="login-wrap">
-		<view v-if="!buildType" style="text-align: center;color: #999999;padding-top: 40px;">{{ envTips }}</view>
-		<image src="../../static/logo.png" class="logo"></image>
+		<view v-if="showEnvTips" style="text-align: center;color: #999999;padding-top: 40px;">{{ envTips }}</view>
+		<image :src="`/static/${theme}/logo.png`" class="logo"></image>
 		<form class="login-form" @submit="formSubmit">
 			<view class="form-item">
 				<u-icon size="40" color="#999" name="account-fill"></u-icon>
@@ -23,7 +23,7 @@
 				<view class="forget-pass" @click="forgetPass">忘记密码</view>
 			</view>
 			<view class="form-btn-con">
-				<button class="form-btn" form-type="submit">登录</button>
+				<button class="form-btn" :style="{background: $config('buttonColors')}" form-type="submit">登录</button>
 				<!-- <text class="apply-btn" @click="applyTrial">还没有账号?马上申请试用</text> -->
 			</view>
 		</form>
@@ -31,7 +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>
@@ -54,14 +54,16 @@ export default {
 			isRemember: true, //  是否记住密码
 			isAuthuserYs: false, // 是否同意隐私政策
 			envTips: '',
-			buildType: ''
+			showEnvTips: '',
+			theme: ''
 		};
 	},
 	mounted() {
+		this.theme = this.$config('themePath')
 		this.isRemember = this.$store.state.vuex_isRemember;
 		this.isAuthuserYs = this.$store.state.vuex_isUsrAuthYs;
 		this.envTips = getApp().globalData.envTips;
-		this.buildType = getApp().globalData.buildType;
+		this.showEnvTips = process.env.NODE_ENV == 'development'
 	},
 	onShow() {
 		//#ifdef APP-PLUS

+ 1 - 1
pages/login/userAuthYs.vue

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

+ 1 - 1
pages/myShopTour/myShopTour.vue

@@ -2,7 +2,7 @@
 	<view class="myShopTour-wrap">
 		<!-- 内容 -->
 		<view class="myShopTour-con">
-			<view class="uTabs"><u-tabs-swiper ref="uTabs" :list="tabList" name="dispName" :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper></view>
+			<view class="uTabs"><u-tabs-swiper ref="uTabs" :list="tabList" :active-color="$config('primaryColors')" name="dispName" :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper></view>
 			<swiper class="data-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 				<swiper-item class="swiper-item" v-for="(tabs, index) in tabList" :key="index">
 					<scroll-view scroll-y class="scroll-con" @scrolltolower="onreachBottom">

+ 1 - 1
pages/myShopTour/searchModal.vue

@@ -16,7 +16,7 @@
 				</u-form-item>
 			</u-form>
 			<view class="uni-list-btns">
-				<button type="primary" @click="handleSearch">查询</button>
+				<button type="primary" :style="{background: $config('buttonColors')}" @click="handleSearch">查询</button>
 				<button type="info" @click="resetForm">重置</button>
 			</view>
 		</u-popup>

+ 1 - 1
pages/shopTour/shopTour.vue

@@ -309,7 +309,7 @@ export default {
 		getStoreVideoUrl(item) {
 			let _this = this
 			getVideoUrl({ streamId: item.streamId, outProtocol: 'hls' }).then(res => {
-				console.log(res);
+				console.log(res,'获取视频地址');
 				if (res.status == 200 && res.data) {
 					this.wv.evalJS("vm.getVideoUrlSuccess('" + res.data.url + "')");
 				} else {

+ 1 - 1
pages/shopTourCompleted/shopTourCompleted.vue

@@ -45,7 +45,7 @@
 			</view>
 		</view>
 		<view class="btn-con">
-			<u-button type="primary" shape="circle" class="btn" @click="goShopTourDetails">查看明细</u-button>
+			<u-button type="primary" :style="{background: $config('buttonColors')}" shape="circle" class="btn" @click="goShopTourDetails">查看明细</u-button>
 			<u-button shape="circle" class="btn" @click="goMyShopTour">我的巡店记录</u-button>
 		</view>
 	</view>

+ 1 - 1
pages/shopTourOver/shopTourOver.vue

@@ -14,7 +14,7 @@
 				<autograph-to-pic ref="xdr" canvasId="handWriting-xd" @generatePictures="autographXdr" />
 			</view>
 		</view>
-		<u-button type="primary" shape="circle" class="submit-btn" @click="submitFun">提交</u-button>
+		<u-button type="primary" :style="{background: $config('buttonColors')}" shape="circle" class="submit-btn" @click="submitFun">提交</u-button>
 	</view>
 </template>
 

+ 3 - 3
pages/shopTourRecord/screenModule.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="uDropdown-wrap">
 		<!-- 顶部筛选条件 -->
-		<u-dropdown ref="uDropdown" class="uDropdown" @close="closeDropdownItem">
+		<u-dropdown ref="uDropdown" :active-color="$config('primaryColors')" class="uDropdown" @close="closeDropdownItem">
 			<u-dropdown-item v-model="searchForm.inspectorId" :title="isAll" @change="dropdownChange" :options="screenClass"></u-dropdown-item>
 			<u-dropdown-item title="检查方式" class="screen-dropdown">
 				<view class="slot-content">
@@ -12,7 +12,7 @@
 							</view>
 						</view>
 					</scroll-view>
-					<u-button style="border-radius: 0;" type="primary" @click="closeTypeDropdown">确定</u-button>
+					<u-button style="border-radius: 0;" :style="{background: $config('buttonColors')}" type="primary" @click="closeTypeDropdown">确定</u-button>
 				</view>
 			</u-dropdown-item>
 			<u-dropdown-item v-model="searchForm.status" title="状态" :options="screenState" @change="dropdownChange"></u-dropdown-item>
@@ -39,7 +39,7 @@
 							</view>
 						</view>
 					</scroll-view>
-					<u-button style="border-radius: 0;" type="primary" @click="closeDropdown">确定</u-button>
+					<u-button style="border-radius: 0;" :style="{background: $config('buttonColors')}" type="primary" @click="closeDropdown">确定</u-button>
 				</view>
 			</u-dropdown-item>
 		</u-dropdown>

+ 1 - 1
pages/signIn/signIn.vue

@@ -32,7 +32,7 @@
 				</view>
 			</view>
 		</view>
-		<u-button type="primary" class="submit-btn" @click="signInFun">签到并开始巡店</u-button>
+		<u-button type="primary" :style="{background: $config('buttonColors')}" class="submit-btn" @click="signInFun">签到并开始巡店</u-button>
 	</view>
 </template>
 

+ 1 - 1
pages/spotCheckCenter/spotCheckResult.vue

@@ -31,7 +31,7 @@
 			</view>
 		</view>
 		<view class="result-back">
-			<u-button type="primary" @click="goBack">返回任务列表</u-button>
+			<u-button type="primary" :style="{background: $config('buttonColors')}" @click="goBack">返回任务列表</u-button>
 		</view>
 	</view>
 </template>

+ 1 - 1
pages/spotCheckCenter/spotChecking.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="pagesCons">
 		<view class="tab-body">
-			<view class="uTabs"><u-tabs-swiper ref="uTabs" :list="tabList" name="dispName" :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper></view>
+			<view class="uTabs"><u-tabs-swiper ref="uTabs" :list="tabList" name="dispName" :active-color="$config('primaryColors')" :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper></view>
 			<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 				<swiper-item 
 				class="swiper-item" 

+ 1 - 1
pages/spotCheckConfigure/addSpotCheck.vue

@@ -47,7 +47,7 @@
 				</u-form-item>
 			</u-form>
 			<view class="btns">
-				<u-button class="confirmBtn" type="primary" size="medium" @click="submit">提交</u-button>
+				<u-button class="confirmBtn" type="primary" :style="{background: $config('buttonColors')}" size="medium" @click="submit">提交</u-button>
 				<u-button class="cancelBtn" size="medium" @click="cancel">取消</u-button>
 			</view>
 			<!-- 周几 -->

+ 1 - 1
pages/toDoList/addBacklog.vue

@@ -31,7 +31,7 @@
 				<u-input v-model="remarks" maxlength="500" type="textarea" placeholder="请输入备注(最多500字符)..." />
 			</view>
 		</view>
-		<u-button @click="handleSave" :loading="loading" class="save-btn" type="primary">保存</u-button>
+		<u-button @click="handleSave" :loading="loading" class="save-btn" :style="{background: $config('buttonColors')}" type="primary">保存</u-button>
 		<!-- 时间选择器 -->
 		<w-picker
 		class="date-picker"

+ 1 - 1
pages/toDoList/searchModal.vue

@@ -25,7 +25,7 @@
 				</u-form-item>
 			</u-form>
 			<view class="uni-list-btns">
-				<button type="primary" @click="handleSearch">查询</button>
+				<button type="primary" :style="{background: $config('buttonColors')}" @click="handleSearch">查询</button>
 				<button type="info" @click="resetForm">重置</button>
 			</view>
 		</u-popup>

+ 1 - 1
pages/toDoList/toDoList.vue

@@ -2,7 +2,7 @@
 	<view class="pagesCons">
 		<view class="tab-body">
 			<view class="uTabs">
-				<u-tabs-swiper ref="uTabs" :list="tabList" name="dispName" :current="current" @change="tabsChange" :is-scroll="false"
+				<u-tabs-swiper ref="uTabs" :list="tabList" :active-color="$config('primaryColors')" name="dispName" :current="current" @change="tabsChange" :is-scroll="false"
 				 swiperWidth="750"></u-tabs-swiper>
 			</view>
 			<view class="all-filter" v-show="current==2">

+ 6 - 8
pages/userCenter/aboutUs.vue

@@ -4,12 +4,12 @@
 			<view class="logoBorder">
 				<image class="logoImg" src="/static/logo.png"></image>
 			</view>
-			<view>智能巡店信息管理平台</view>
+			<view>{{$config('appName')}}</view>
 		</view>
 		<view class="textContent">
-			<view>陕西山海高科信息技术有限公司专注于汽车服务行业,成立于古城西安,是一家以先进云端互联网技术驱动的公司,致力于通过saas云门店管理系统为汽车综修厂、社区店以及大量的中小门店赋能。以解决汽车维修、美容、保养等业务中发生的一系列问题。</view>
-			<view>智能巡店设计了一套完善的降本增效方案,在引流获客、员工提成、营销活动、财务报表、数据分析等方面获得客户一致认可。</view>
-			<view>山海高科将通过持续的科技成果转化为推动汽后市场发展提供动力,帮助更多服务终端、供应链企业、主机厂商、银行以及保险等汽车后市场参与方转型升级。</view>
+			<view>{{$config('company')}}专注于汽车服务行业,是一家以先进云端互联网技术驱动的公司,致力于通过saas云门店管理系统为汽车综修厂、社区店以及大量的中小门店赋能。以解决汽车维修、美容、保养等业务中发生的一系列问题。</view>
+			<view>{{$config('appName')}}设计了一套完善的降本增效方案,在引流获客、员工提成、营销活动、财务报表、数据分析等方面获得客户一致认可。</view>
+			<view>将通过持续的科技成果转化为推动汽后市场发展提供动力,帮助更多服务终端、供应链企业、主机厂商、银行以及保险等汽车后市场参与方转型升级。</view>
 		</view>
 	</view>
 </template>
@@ -30,14 +30,12 @@
 			.logoBorder{
 				width:200rpx;
 				height:200rpx;
-				border:2px solid #eee;
-				border-radius: 20rpx;
 				margin:50rpx 0 15rpx 0;
 				display: inline-block;
 				position: relative;
 				.logoImg{
-					width:135rpx;
-					height:180rpx;
+					width:200rpx;
+					height:200rpx;
 					position: absolute;
 					top:0;
 					left:0;

+ 1 - 1
pages/userCenter/changePwd.vue

@@ -22,7 +22,7 @@
 			<button @click="handleReset" type="info">
 				重置
 			</button>
-			<button @click="handleSubmit" :loading="loading" type="primary">
+			<button @click="handleSubmit" :style="{background: $config('buttonColors')}" :loading="loading" type="primary">
 				保存
 			</button>
 		</view>

+ 1 - 1
pages/userCenter/userCenter.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<!-- 门店信息 -->
-		<view class="store">
+		<view class="store" :style="{background: $config('topBarBackground')}">
 			<view class="storeInfo">
 				<image :src="personIcon" class="personImg"></image>
 				<view class="storeName">

BIN
static/logo.png


BIN
static/pt.png


BIN
static/qiubxd/logo.png


+ 0 - 0
static/navIcon/djpz.png → static/qiubxd/navIcon/djpz.png


+ 0 - 0
static/navIcon/djzx.png → static/qiubxd/navIcon/djzx.png


+ 0 - 0
static/navIcon/spxd.png → static/qiubxd/navIcon/spxd.png


+ 0 - 0
static/navIcon/wdxd.png → static/qiubxd/navIcon/wdxd.png


+ 0 - 0
static/navIcon/xcjc.png → static/qiubxd/navIcon/xcjc.png


+ 0 - 0
static/navIcon/zdjl.png → static/qiubxd/navIcon/zdjl.png


BIN
static/qiubxd/tabbar/home-active.png


+ 0 - 0
static/tabbar/home.png → static/qiubxd/tabbar/home.png


BIN
static/qiubxd/tabbar/user-active.png


+ 0 - 0
static/tabbar/user.png → static/qiubxd/tabbar/user.png


BIN
static/qiubxd/tabbar/work-active.png


+ 0 - 0
static/tabbar/work.png → static/qiubxd/tabbar/work.png


BIN
static/zyuxd/logo.png


BIN
static/zyuxd/navIcon/djpz.png


BIN
static/zyuxd/navIcon/djzx.png


BIN
static/zyuxd/navIcon/spxd.png


BIN
static/zyuxd/navIcon/wdxd.png


BIN
static/zyuxd/navIcon/xcjc.png


BIN
static/zyuxd/navIcon/zdjl.png


+ 0 - 0
static/tabbar/home-active.png → static/zyuxd/tabbar/home-active.png


+ 0 - 0
unpackage/dist/dev/app-plus/static/tabbar/home.png → static/zyuxd/tabbar/home.png


+ 0 - 0
static/tabbar/user-active.png → static/zyuxd/tabbar/user-active.png


+ 0 - 0
unpackage/dist/dev/app-plus/static/tabbar/user.png → static/zyuxd/tabbar/user.png


+ 0 - 0
static/tabbar/work-active.png → static/zyuxd/tabbar/work-active.png


+ 0 - 0
unpackage/dist/dev/app-plus/static/tabbar/work.png → static/zyuxd/tabbar/work.png


+ 0 - 0
unpackage/dist/dev/.automator/app-plus/.automator.json


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappchooselocation.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappes6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappopenlocation.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/__uniapppicker.js


File diff suppressed because it is too large
+ 0 - 6
unpackage/dist/dev/app-plus/__uniappquill.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappquillimageresize.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/__uniappscan.js


BIN
unpackage/dist/dev/app-plus/__uniappsuccess.png


+ 0 - 25
unpackage/dist/dev/app-plus/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 3
unpackage/dist/dev/app-plus/app-config-service.js


+ 0 - 154
unpackage/dist/dev/app-plus/app-config.js

@@ -1,154 +0,0 @@
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// install a JSONP callback for chunk loading
-/******/ 	function webpackJsonpCallback(data) {
-/******/ 		var chunkIds = data[0];
-/******/ 		var moreModules = data[1];
-/******/ 		var executeModules = data[2];
-/******/
-/******/ 		// add "moreModules" to the modules object,
-/******/ 		// then flag all "chunkIds" as loaded and fire callback
-/******/ 		var moduleId, chunkId, i = 0, resolves = [];
-/******/ 		for(;i < chunkIds.length; i++) {
-/******/ 			chunkId = chunkIds[i];
-/******/ 			if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
-/******/ 				resolves.push(installedChunks[chunkId][0]);
-/******/ 			}
-/******/ 			installedChunks[chunkId] = 0;
-/******/ 		}
-/******/ 		for(moduleId in moreModules) {
-/******/ 			if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
-/******/ 				modules[moduleId] = moreModules[moduleId];
-/******/ 			}
-/******/ 		}
-/******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
-/******/
-/******/ 		while(resolves.length) {
-/******/ 			resolves.shift()();
-/******/ 		}
-/******/
-/******/ 		// add entry modules from loaded chunk to deferred list
-/******/ 		deferredModules.push.apply(deferredModules, executeModules || []);
-/******/
-/******/ 		// run deferred modules when all chunks ready
-/******/ 		return checkDeferredModules();
-/******/ 	};
-/******/ 	function checkDeferredModules() {
-/******/ 		var result;
-/******/ 		for(var i = 0; i < deferredModules.length; i++) {
-/******/ 			var deferredModule = deferredModules[i];
-/******/ 			var fulfilled = true;
-/******/ 			for(var j = 1; j < deferredModule.length; j++) {
-/******/ 				var depId = deferredModule[j];
-/******/ 				if(installedChunks[depId] !== 0) fulfilled = false;
-/******/ 			}
-/******/ 			if(fulfilled) {
-/******/ 				deferredModules.splice(i--, 1);
-/******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
-/******/ 			}
-/******/ 		}
-/******/
-/******/ 		return result;
-/******/ 	}
-/******/
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// object to store loaded and loading chunks
-/******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
-/******/ 	// Promise = chunk loading, 0 = chunk loaded
-/******/ 	var installedChunks = {
-/******/ 		"app-config": 0
-/******/ 	};
-/******/
-/******/ 	var deferredModules = [];
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/";
-/******/
-/******/ 	var jsonpArray = this["webpackJsonp"] = this["webpackJsonp"] || [];
-/******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
-/******/ 	jsonpArray.push = webpackJsonpCallback;
-/******/ 	jsonpArray = jsonpArray.slice();
-/******/ 	for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
-/******/ 	var parentJsonpFunction = oldJsonpFunction;
-/******/
-/******/
-/******/ 	// run deferred modules from other chunks
-/******/ 	checkDeferredModules();
-/******/ })
-/************************************************************************/
-/******/ ([]);

File diff suppressed because it is too large
+ 0 - 9
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 0 - 229
unpackage/dist/dev/app-plus/app-view.js


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/aliplayer-h5-min.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/aliplayer-min.css


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/aliplayer-min.js


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/bigplay.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/cc.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/dragcursor.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/dragcursorhover.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/fullscreen.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/pauseanimation.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/playanimation.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/setting.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/smallpause.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/smallplay.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/smallscreen.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/snapshot.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/aliplayer/img/volume.png


File diff suppressed because it is too large
+ 0 - 7
unpackage/dist/dev/app-plus/hybrid/html/antd/antd.min.css


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/app-plus/hybrid/html/antd/antd.min.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/hybrid/html/imgEdit/ped.min.js


File diff suppressed because it is too large
+ 0 - 12
unpackage/dist/dev/app-plus/hybrid/html/js/less.min.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/hybrid/html/js/moment-with-locales.min.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/hybrid/html/js/moment.min.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/hybrid/html/js/uni.webview.1.5.2.js


File diff suppressed because it is too large
+ 0 - 5
unpackage/dist/dev/app-plus/hybrid/html/js/vue@2.6.11


BIN
unpackage/dist/dev/app-plus/hybrid/html/static/icons/close.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/static/icons/down.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/static/icons/kz-mini.png


BIN
unpackage/dist/dev/app-plus/hybrid/html/static/icons/left.png


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