6.28

.gitignore

@@ -1,2 +1,2 @@
-/unpackage
+unpackage
 .DS_Store

.hbuilderx/launch.json

@@ -1,6 +1,6 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
     "configurations": [{
      	"default" : 
      	{
@@ -11,6 +11,6 @@
      		"launchtype" : "local"
      	},
      	"type" : "uniCloud"
-     }
-    ]
-}
+     }
+    ]
+}

App.vue

@@ -3,15 +3,15 @@
 		onLaunch: function() {
 			console.log('App Launch')
 			uni.hideTabBar()
-			// this.getuser()
-			if (uni.getStorageSync("token")) {
-				this.$u.post('/User/getDetail').then(res => {
-					if (res.code == 0) {
-						this.$Socket.connectSocket()
-					} else {
-						uni.removeStorageSync("token")
-					}
-				})
+			// this.getuser()
+			if (uni.getStorageSync("token")) {
+				this.$u.post('/User/getDetail').then(res => {
+					if (res.code == 0) {
+						this.$Socket.connectSocket()
+					} else {
+						uni.removeStorageSync("token")
+					}
+				})
 			}
 			this.$u.post('/Version/initialization').then(res => {
 				if (res.response.is_open_bottom_business == 1) {
@@ -101,19 +101,19 @@
 									this.getuser()
 								}, 1500)
 							} else {
-								uni.removeStorageSync("token")
-								setTimeout(() => {
-									this.getuser()
+								uni.removeStorageSync("token")
+								setTimeout(() => {
+									this.getuser()
 								}, 2000)
 								if (res.msg == '请登录。' || res.msg == '账号在其他地方登录，请重新登录。') {
-									this.$u.toast(res.msg)
+									this.$u.toast(res.msg)
 									console.log(getCurrentPages()[0].route);
-									if (getCurrentPages()[0] && getCurrentPages()[0].route != 'pages/index/index') {
-										setTimeout(() => {
-											uni.navigateTo({
-												url: "/pages/mine/login-wx"
-											})
-										},800)
+									if (getCurrentPages()[0] && getCurrentPages()[0].route != 'pages/index/index') {
+										setTimeout(() => {
+											uni.navigateTo({
+												url: "/pages/mine/login-wx"
+											})
+										}, 800)
 									}
 									// console.log(getCurrentPages()[0].route);
 								}
@@ -125,8 +125,8 @@
 						}, 2000)
 					}
 				} else {
-					setTimeout(() => {
-						this.getuser()
+					setTimeout(() => {
+						this.getuser()
 					}, 2000)
 				}
 			}

common/http.interceptor.js

@@ -52,7 +52,7 @@ const install = (Vue, vm) => {
 			config.data.header.category = 3
 			config.data.header.secret_key = secret_key
 			// config.data.header.debug = "5CDAC27A0F89C916553DE870F3C55181"//默认登录
-			config.data.header.version_name = "beta2"//默认数据
+			config.data.header.version_name = ""//默认数据beta2
 			config.data.header.token = token;
 			config.data = {
 				request: JSON.stringify(config.data) //config.data

common/url.js

@@ -1,2 +1,2 @@
-var url = 'http://app.dd.ponyinfo.net'
+var url = 'https://app.dd.ponyinfo.net'
 export default url

common/websocket.js

@@ -27,9 +27,9 @@ function getMessage(callback = function() {}) {
 }
 // 接受消息
 uni.onSocketMessage((res) => {
-	console.log("-------这里-------");
-	console.log(res);
-	console.log("------------------");
+	// console.log("-------这里-------");
+	// console.log(res);
+	// console.log("------------------");
 	if (JSON.parse(res.data).code == '0000') {
 		uni.$u.post('/User/setWebsocketId', {
 			content: {

components/x-button.vue

@@ -16,7 +16,7 @@
 	 * @property {Number} height 高度
 	 * @property {String} borderRadius 圆角
 	 * @property {String} color 文字颜色
-	 * @event {Function} click 按钮点击
+	 * @event {Function} click 按钮点击
 	 * @example <x-button>按钮</x-button>
 	 */
 	export default {
@@ -39,7 +39,7 @@
 			},
 			color: {
 				type: String,
-				default: "#08AA8C"
+				default: "#00a3a0"
 			}
 		},
 		created() {
@@ -111,9 +111,9 @@
 			right: -2rpx;
 			bottom: -2rpx;
 			left: -2rpx;
-			background: linear-gradient(90deg, #08AA8C, #FDCE1C);
+			background: linear-gradient(90deg, #00a3a0, #fff);
 			box-shadow: 0rpx 0rpx 9rpx 0rpx rgba(0, 0, 0, 0.75);
 
 		}
 	}
-</style>
+</style>

components/x-navbar.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="x-navbar">
-		<u-navbar :background="{background:'#2AA47F'}" :is-back="false" :title="title" :borderBottom="false"
+		<u-navbar :background="{background:'#00a3a0'}" :is-back="false" :title="title" :borderBottom="false"
 			title-color="#fff">
 			<view class="left-box u-flex u-col-center" slot="left">
 				<image src="/static/images/index1-1.png" @tap="openleft" style="width: 47rpx;height: 43rpx;" mode="">
@@ -36,21 +36,23 @@
 					<image v-else src="../static/images/order1.png" mode=""></image> -->
 					<text>订单</text>
 				</view>
-				<view :class="active == 2 ? 'tabbar-item tabbar-item1' : 'tabbar-item'" @tap="totabbar(2)">
-					<!-- <image v-if="active == 2" src="../static/images/shop.png" mode=""></image>
-					<image v-else src="../static/images/shop1.png" mode=""></image> -->
+				
+				<!-- <view :class="active == 2 ? 'tabbar-item tabbar-item1' : 'tabbar-item'" @tap="totabbar(2)">
+					<image v-if="active == 2" src="../static/images/shop.png" mode=""></image>
+					<image v-else src="../static/images/shop1.png" mode=""></image>
 					<text>商城</text>
-				</view>
+				</view> -->
+				
 				<view :class="active == 3 ? 'tabbar-item tabbar-item1' : 'tabbar-item'" @tap="totabbar(3)">
 					<!-- <image v-if="active == 3" src="../static/images/mine.png" mode=""></image>
 					<image v-else src="../static/images/mine1.png" mode=""></image> -->
 					<text>我的</text>
-				</view>
-				<view class="u-flex-col" style="padding: 0 120rpx;">
-					<text style="padding: 10rpx 0;" @click="topage(1)">账号设置</text>
-					<text style="padding: 10rpx 0;" @click="topage(2)">地址管理</text>
-					<text style="padding: 10rpx 0;" @click="topage(3)">应用设置</text>
-					<text style="padding: 10rpx 0;" @click="topage(4)">客服咨询</text>
+				</view>
+				<view class="u-flex-col" style="padding: 0 120rpx;">
+					<text style="padding: 10rpx 0;" @click="topage(1)">账号设置</text>
+					<text style="padding: 10rpx 0;" @click="topage(2)">地址管理</text>
+					<text style="padding: 10rpx 0;" @click="topage(3)">应用设置</text>
+					<text style="padding: 10rpx 0;" @click="topage(4)">客服咨询</text>
 				</view>
 				<!-- <view class="out-login u-flex u-col-center" @tap="toout">
 					<image src="../static/images/mine1-4.png" mode=""></image>
@@ -84,43 +86,43 @@
 			return {
 				show: false,
 				statusheight: 0,
-				userdata: {},
+				userdata: {},
 				count:0
 			}
 		},
 		created() {
 			this.statusheight = uni.getSystemInfoSync().statusBarHeight
 		},
-		methods: {
-			topage(type){
-				this.show = false
-				if(type == 4){
-					uni.navigateTo({
-						url:"/pages/mine/all-tips?type=23"
-					})
-				}
-				if (!uni.getStorageSync("token")) {
-					uni.navigateTo({
-						url: "/pages/mine/login-wx"
-					})
-					return
-				}
-				if(type == 1){
-					uni.navigateTo({
-						url:"/pages/mine/userinfo"
-					})
-				}
-				if(type == 2){
-					uni.navigateTo({
-						url:"/pages/mine/address-list"
-					})
-				}
-				if(type == 3){
-					uni.navigateTo({
-						url:"/pages/mine/setting"
-					})
-				}
-				
+		methods: {
+			topage(type){
+				this.show = false
+				if(type == 4){
+					uni.navigateTo({
+						url:"/pages/mine/all-tips?type=23"
+					})
+				}
+				if (!uni.getStorageSync("token")) {
+					uni.navigateTo({
+						url: "/pages/mine/login-wx"
+					})
+					return
+				}
+				if(type == 1){
+					uni.navigateTo({
+						url:"/pages/mine/userinfo"
+					})
+				}
+				if(type == 2){
+					uni.navigateTo({
+						url:"/pages/mine/address-list"
+					})
+				}
+				if(type == 3){
+					uni.navigateTo({
+						url:"/pages/mine/setting"
+					})
+				}
+				
 			},
 			touser() {
 				this.show = false
@@ -187,15 +189,15 @@
 					})
 				}
 			},
-			toxiaoxi() {
-				if (uni.getStorageSync("token")) {
-					uni.navigateTo({
-						url: "/pages/mine/xiaoxi"
-					})
-				} else {
-					uni.navigateTo({
-						url: "/pages/mine/login-wx"
-					})
+			toxiaoxi() {
+				if (uni.getStorageSync("token")) {
+					uni.navigateTo({
+						url: "/pages/mine/xiaoxi"
+					})
+				} else {
+					uni.navigateTo({
+						url: "/pages/mine/login-wx"
+					})
 				}
 				
 			},
@@ -241,16 +243,16 @@
 
 				text {
 					flex: 1;
-					font-size: 24rpx;
+					font-size: 24rpx;
 					padding-left: 90rpx;
 				}
 			}
 
 			.tabbar-item1 {
-				background-color: #2AA47F;
+				background-color: #00a3a0;
 
 				text {
-					color: #fff;
+					color: #fff;
 					
 				}
 			}
@@ -301,4 +303,4 @@
 			}
 		}
 	}
-</style>
+</style>

components/x-tabbar.vue

@@ -1,6 +1,6 @@
 <template>
 	<view v-if="list.length > 0">
-		<u-tabbar v-model="current" bg-color="#2AA47F" inactive-color="#D7D7D7" active-color="#fff" :list="list"></u-tabbar>
+		<u-tabbar v-model="current" bg-color="#00a3a0" inactive-color="#D7D7D7" active-color="#fff" :list="list"></u-tabbar>
 	</view>
 </template>
 
@@ -12,19 +12,19 @@
 				list: [],
 				current: 0
 			};
-		},
-		created() {
-			// console.log(this.$tabbar);
-			this.list = uni.$tabbar
-		},
-		methods:{
-			setbadge(num = 0){
-				this.list[1].count = num
-			}
+		},
+		created() {
+			// console.log(this.$tabbar);
+			this.list = uni.$tabbar
+		},
+		methods:{
+			setbadge(num = 0){
+				this.list[1].count = num
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
 
-</style>
+</style>

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "小马叮叮",
-    "appid" : "__UNI__AA38392",
+    "appid" : "__UNI__7B7AA93",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages.json

@@ -8,114 +8,114 @@
 		"^x-(.*)": "@/components/x-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "广告页",
-				"navigationStyle": "custom"
-			}
-		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "广告页",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/index/home",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationStyle": "custom",
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
-		},
-		{
-			"path": "pages/index/wenzhang",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/mine/all-tips",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/mine/xiaoxi-info",
-			"style": {
-				"navigationBarTitleText": "消息详情",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/paotui",
-			"style": {
-				"navigationBarTitleText": "跑腿服务",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/daijia",
-			"style": {
-				"navigationBarTitleText": "代驾服务",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/order/order-info",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/order/jindu",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/order/fuwu-orderinfo",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/change-address",
-			"style": {
-				"navigationBarTitleText": "选择地址",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/weixiu",
-			"style": {
-				"navigationBarTitleText": "水电服务",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/other-tabs",
-			"style": {
-				"navigationBarTitleText": "其他服务",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white"
-			}
+		},
+		{
+			"path": "pages/index/wenzhang",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/all-tips",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/xiaoxi-info",
+			"style": {
+				"navigationBarTitleText": "消息详情",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/paotui",
+			"style": {
+				"navigationBarTitleText": "跑腿服务",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/daijia",
+			"style": {
+				"navigationBarTitleText": "代驾服务",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/order/order-info",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/order/jindu",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/order/fuwu-orderinfo",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/change-address",
+			"style": {
+				"navigationBarTitleText": "选择地址",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/weixiu",
+			"style": {
+				"navigationBarTitleText": "水电服务",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/other-tabs",
+			"style": {
+				"navigationBarTitleText": "其他服务",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
 		},
 		{
 			"path": "pages/mine/forget",
 			"style": {
 				"navigationBarTitleText": "找回密码",
-				"navigationBarBackgroundColor": "#2AA47F",
+				"navigationBarBackgroundColor": "#00a3a0",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -124,7 +124,7 @@
 			"style": {
 				"navigationBarTitleText": "订单",
 				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white",
+				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -133,25 +133,25 @@
 			"style": {
 				"navigationBarTitleText": "小马服务商",
 				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white",
+				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": true
 			}
-		},
-		{
-			"path": "pages/mine/more-fuwu",
-			"style": {
-				"navigationBarTitleText": "开通服务",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#2AA47F"
-			}
-		},
-		{
-			"path": "pages/mine/kaitong-fuwu",
-			"style": {
-				"navigationBarTitleText": "开通服务",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#2AA47F"
-			}
+		},
+		{
+			"path": "pages/mine/more-fuwu",
+			"style": {
+				"navigationBarTitleText": "开通服务",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#00a3a0"
+			}
+		},
+		{
+			"path": "pages/mine/kaitong-fuwu",
+			"style": {
+				"navigationBarTitleText": "开通服务",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#00a3a0"
+			}
 		},
 		{
 			"path": "pages/mine/mine",
@@ -159,37 +159,37 @@
 				"navigationBarTitleText": "我的",
 				"navigationStyle": "custom"
 			}
-		},
-		{
-			"path": "pages/shop/shop-orderinfo",
-			"style": {
-				"navigationBarTitleText": "订单",
-				"navigationBarTextStyle":"white",
-				"navigationBarBackgroundColor": "#2AA47F"
-			}
-		},
-		{
-			"path": "pages/shop/shop-order",
-			"style": {
-				"navigationBarTitleText": "店铺订单",
-				"navigationStyle": "custom",
-				"navigationBarTextStyle":"white",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shop/myshop",
-			"style": {
-				"navigationBarTitleText": "我的店铺",
-				"navigationStyle": "custom",
-				"navigationBarTextStyle":"white"
-			}
+		},
+		{
+			"path": "pages/shop/shop-orderinfo",
+			"style": {
+				"navigationBarTitleText": "订单",
+				"navigationBarTextStyle":"white",
+				"navigationBarBackgroundColor": "#00a3a0"
+			}
+		},
+		{
+			"path": "pages/shop/shop-order",
+			"style": {
+				"navigationBarTitleText": "店铺订单",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle":"white",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shop/myshop",
+			"style": {
+				"navigationBarTitleText": "我的店铺",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle":"white"
+			}
 		},
 		{
 			"path": "pages/shop/shop",
 			"style": {
 				"navigationBarTitleText": "商城",
-				"navigationStyle": "custom",
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -197,8 +197,8 @@
 			"path": "pages/shop/search",
 			"style": {
 				"navigationBarTitleText": "商品搜索",
-				"navigationBarBackgroundColor": "#2AA47F",
-				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -206,7 +206,7 @@
 			"path": "pages/shop/xiadan",
 			"style": {
 				"navigationBarTitleText": "确定下单",
-				"navigationBarBackgroundColor": "#2AA47F",
+				"navigationBarBackgroundColor": "#00a3a0",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -224,20 +224,20 @@
 				"navigationBarTitleText": "登录",
 				"navigationBarBackgroundColor": "#E3F7F0"
 			}
-		},
-		{
-			"path": "pages/mine/login-wx",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"navigationBarBackgroundColor": "#E3F7F0"
-			}
+		},
+		{
+			"path": "pages/mine/login-wx",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"navigationBarBackgroundColor": "#E3F7F0"
+			}
 		},
 		{
 			"path": "pages/mine/address-list",
 			"style": {
 				"navigationBarTitleText": "地址管理",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -245,7 +245,7 @@
 			"path": "pages/mine/address-set",
 			"style": {
 				"navigationBarTitleText": "地址管理",
-				"navigationBarBackgroundColor": "#09AA8C",
+				"navigationBarBackgroundColor": "#00a3a0",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -253,7 +253,7 @@
 			"path": "pages/mine/setting",
 			"style": {
 				"navigationBarTitleText": "应用设置",
-				"navigationBarBackgroundColor": "#09AA8C",
+				"navigationBarBackgroundColor": "#00a3a0",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -261,131 +261,131 @@
 			"path": "pages/mine/bangding",
 			"style": {
 				"navigationBarTitleText": "绑定手机号",
-				"navigationBarBackgroundColor": "#09AA8C",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/change-tel",
+			"style": {
+				"navigationBarTitleText": "更换手机绑定",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/change-pwd",
+			"style": {
+				"navigationBarTitleText": "设置密码",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/anquan",
+			"style": {
+				"navigationBarTitleText": "帐号安全",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/tel-list",
+			"style": {
+				"navigationBarTitleText": "设置手机号密码",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/mine/tel-add",
+			"style": {
+				"navigationBarTitleText": "设置手机号",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/wenda-list",
+			"style": {
+				"navigationBarTitleText": "设置找回密码问答",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/mine/wenda-add",
+			"style": {
+				"navigationBarTitleText": "设置问答",
+				"navigationBarBackgroundColor": "#00a3a0",
 				"navigationBarTextStyle": "white"
 			}
-		},
-		{
-			"path": "pages/mine/change-tel",
-			"style": {
-				"navigationBarTitleText": "更换手机绑定",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/mine/change-pwd",
-			"style": {
-				"navigationBarTitleText": "设置密码",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/mine/anquan",
-			"style": {
-				"navigationBarTitleText": "帐号安全",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/mine/tel-list",
-			"style": {
-				"navigationBarTitleText": "设置手机号密码",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/mine/tel-add",
-			"style": {
-				"navigationBarTitleText": "设置手机号",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/mine/wenda-list",
-			"style": {
-				"navigationBarTitleText": "设置找回密码问答",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/mine/wenda-add",
-			"style": {
-				"navigationBarTitleText": "设置问答",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white"
-			}
 		},
 		{
 			"path": "pages/mine/forget-tel",
 			"style": {
 				"navigationBarTitleText": "找回密码",
-				"navigationBarBackgroundColor": "#09AA8C",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/forget-tel1",
+			"style": {
+				"navigationBarTitleText": "找回密码",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/xiaoxi",
+			"style": {
+				"navigationBarTitleText": "消息管理",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/mine/yaoqing",
+			"style": {
+				"navigationBarTitleText": "用户邀请码",
+				"navigationBarBackgroundColor": "#00a3a0",
 				"navigationBarTextStyle": "white"
 			}
-		},
-		{
-			"path": "pages/mine/forget-tel1",
-			"style": {
-				"navigationBarTitleText": "找回密码",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/mine/xiaoxi",
-			"style": {
-				"navigationBarTitleText": "消息管理",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/mine/yaoqing",
-			"style": {
-				"navigationBarTitleText": "用户邀请码",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/mine/yaoqing-user",
-			"style": {
-				"navigationBarTitleText": "已邀请用户",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": true
-			}
+		},
+		{
+			"path": "pages/mine/yaoqing-user",
+			"style": {
+				"navigationBarTitleText": "已邀请用户",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": true
+			}
 		},
 		{
 			"path": "pages/mine/userinfo",
 			"style": {
 				"navigationBarTitleText": "账号设置",
-				"navigationBarBackgroundColor": "#09AA8C",
+				"navigationBarBackgroundColor": "#00a3a0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/mine/fuwu-info",
+			"style": {
+				"navigationBarTitleText": "身份资料",
+				"navigationBarBackgroundColor": "#00a3a0",
 				"navigationBarTextStyle": "white"
 			}
-		},
-		{
-			"path": "pages/mine/fuwu-info",
-			"style": {
-				"navigationBarTitleText": "身份资料",
-				"navigationBarBackgroundColor": "#09AA8C",
-				"navigationBarTextStyle": "white"
-			}
 		},
 		{
 			"path": "pages/mine/forget-wen",
 			"style": {
 				"navigationBarTitleText": "找回密码",
-				"navigationBarBackgroundColor": "#09AA8C",
+				"navigationBarBackgroundColor": "#00a3a0",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -393,7 +393,7 @@
 			"path": "pages/mine/forget-wen1",
 			"style": {
 				"navigationBarTitleText": "找回密码",
-				"navigationBarBackgroundColor": "#09AA8C",
+				"navigationBarBackgroundColor": "#00a3a0",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -414,7 +414,7 @@
 	"tabBar": {
 		"color": "#D7D7D7",
 		"selectedColor": "#FFFFFF",
-		"backgroundColor": "#2AA47F",
+		"backgroundColor": "#00a3a0",
 		"list": [{
 				// "iconPath": "static/images/index1.png",
 				// "selectedIconPath": "static/images/index.png",
@@ -441,4 +441,4 @@
 			}
 		]
 	}
-}
+}

pages/fuwu/fuwu.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="fuwu">
-		<u-navbar :background="{background:'#2AA47F'}" title="小马服务商" :borderBottom="false" title-color="#fff"
+		<u-navbar :background="{background:'#00a3a0'}" title="小马服务商" :borderBottom="false" title-color="#fff"
 			back-icon-color="#fff">
 			<view class="left-box u-flex u-col-center" slot="left">
 				<view style="width: 47rpx;height: 43rpx;position: relative;margin-right: 25rpx;" @tap="toxiaoxi">
@@ -10,41 +10,41 @@
 				</view>
 				<image src="../../static/images/fuwu1-1.png" style="width: 44rpx;height: 44rpx;" mode="" @tap="totips"></image>
 			</view>
-		</u-navbar>
-		<view class="notice-box" v-if="list.length > 0">
-			<u-notice-bar @click="openbar" mode="vertical" :list="list" bg-color="#fff" color="#000"></u-notice-bar>
-		</view>
-		<view class="swiper">
-			<u-swiper :list="swiper" @click="openad" name="advertise_image" height="417" mode="none"></u-swiper>
+		</u-navbar>
+		<view class="notice-box" v-if="list.length > 0">
+			<u-notice-bar @click="openbar" mode="vertical" :list="list" bg-color="#fff" color="#000"></u-notice-bar>
+		</view>
+		<view class="swiper">
+			<u-swiper :list="swiper" @click="openad" name="advertise_image" height="417" mode="none"></u-swiper>
 		</view>
 		<view class="row-box1 u-flex u-col-center u-row-between">
-			<text class="text1">您已是服务提供者</text>
-			<text class="text2" @tap="tofuwu" style="color: #08AA8C;">修改身份资料</text>
-			<u-icon name="arrow-right" color="#08AA8C"></u-icon>
+			<text class="text1">您已是服务提供者</text>
+			<text class="text2" @tap="tofuwu" style="color: #00a3a0;">修改身份资料</text>
+			<u-icon name="arrow-right" color="#00a3a0"></u-icon>
 		</view>
 		<view class="row-box2 u-flex u-col-center">
 			<text class="text1">在线接单状态</text>
-			<u-switch v-model="checked" size="40" active-color="#08AA8C"></u-switch>
+			<u-switch v-model="checked" size="40" active-color="#00a3a0"></u-switch>
 		</view>
 		<view class="row-box3 u-flex u-col-center">
 			<text class="text1">接单时间：{{jiedantime || '未设置'}}</text>
 			<!-- <view class="text2">
 				<text>设置时间</text>
 			</view> -->
-			<picker mode="multiSelector" :range="timedata" @change="changetime">
-				<x-button :width="178" :height="46" color="#000" fontSize="30rpx">设置时间</x-button>
+			<picker mode="multiSelector" :range="timedata" @change="changetime">
+				<x-button :width="178" :height="46" color="#000" fontSize="30rpx">设置时间</x-button>
 			</picker>
 		</view>
 		<view class="order-box">
 			<view class="fuwu-tabs u-flex u-col-center u-row-between">
-				<text :class="fuwutype == 1 ? 'text' : ''" @tap="getfuwu(1)">已开通项目</text>
+				<text :class="fuwutype == 1 ? 'text' : ''" @tap="getfuwu(1)">已开通项目</text>
 				<text :class="fuwutype == 0 ? 'text' : ''" @tap="getfuwu(0)">申请中项目</text>
 			</view>
 			<view class="fuwu-list u-flex u-col-center">
 				<view class="item u-flex-col u-col-center" v-for="(item,index) in fuwulist" :key='index' @tap="toinfo(item.classify_id)">
 					<view class="image u-flex u-col-center u-row-center">
 						<image :src="item.classify_image" mode=""></image>
-						<text class="text2" v-if="fuwutype == 1" style="color: #2AA47F;">通过</text>
+						<text class="text2" v-if="fuwutype == 1" style="color: #00a3a0;">通过</text>
 						<text class="text2" v-if="fuwutype == 0">审核中</text>
 					</view>
 					<view class="name">
@@ -61,7 +61,7 @@
 				<view class="item-box u-flex u-col-center u-row-between" v-for="(item,index) in allfuwu" :key="index" @tap="toinfo(item.id)">
 					<image :src="item.image" mode=""></image>
 					<view class="item-right u-flex-col u-row-center">
-						<text style="font-size: 30rpx;">{{item.title}}</text>
+						<text style="font-size: 30rpx;">{{item.title}}</text>
 						<text style="font-size: 24rpx;color: #333;">{{item.desc}}</text>
 					</view>
 				</view>
@@ -71,157 +71,157 @@
 	</view>
 </template>
 
-<script>
+<script>
 	import time from "../../common/time.js"
 	export default {
 		data() {
 			return {
 				fuwutype: 1,
 				checked: false,
-				id: '',
-				count:0,
-				userdata:{},
-				jiedantime:'',
-				timedata:[],
-				fuwulist:[],
-				allfuwu:[],
-				list:[],
+				id: '',
+				count:0,
+				userdata:{},
+				jiedantime:'',
+				timedata:[],
+				fuwulist:[],
+				allfuwu:[],
+				list:[],
 				swiper:''
 			}
-		},
-		onShow() {
-			if(uni.getStorageSync("token")){
-				this.$u.post('/UserMessage/getMessageReadFalseCount').then(res => {
-					if (res.code == 0) {
-						this.count = res.response.count
-					}
-				})
-				this.getuser()
-				this.getfuwu(this.fuwutype)
-				this.getallfuwu()
-			}
+		},
+		onShow() {
+			if(uni.getStorageSync("token")){
+				this.$u.post('/UserMessage/getMessageReadFalseCount').then(res => {
+					if (res.code == 0) {
+						this.count = res.response.count
+					}
+				})
+				this.getuser()
+				this.getfuwu(this.fuwutype)
+				this.getallfuwu()
+			}
 		},
 		onLoad() {
-			this.timedata.push(time)
-			this.timedata.push(time)
+			this.timedata.push(time)
+			this.timedata.push(time)
 			this.getad()
-		},
-		onPullDownRefresh() {
-			this.getad()
-			this.getuser()
-			this.getfuwu(this.fuwutype)
-			this.getallfuwu()
 		},
-		methods: {
-			tofuwu(){
-				uni.navigateTo({
-					url:"../mine/fuwu-info"
-				})
-			},
-			openbar(e){
-				this.$openad(this.list[e])
-			},
-			openad(e){
-				this.$openad(this.swiper[e])
-			},
-			async getad(){
-				var {response:{data}} = await this.$u.post('/Advertise/all',{
-					content:{
-						business:1,
-						device_type:2
-					}
-				})
-				data.forEach(val => {
-					if(val.type == 1){
-						this.swiper = val.advertise
-					}
-					if(val.type == 2){
-						this.list = val.advertise
-					}
-				})
-				console.log(this.list);
-			},
-			getallfuwu(){
-				this.$u.post('/FacilitatorExamine/allClassify').then(res => {
-					uni.stopPullDownRefresh()
-					this.allfuwu = res.response.data
-				})
-			},
-			toinfo(id){
-				uni.navigateTo({
-					url:"../mine/kaitong-fuwu?id=" + id
-				})
-			},
-			getfuwu(type){
-				this.fuwutype = type
-				this.$u.post('/FacilitatorExamine/getQualificationsExamineList',{
-					content:{
-						status:this.fuwutype
-					}
-				}).then(res => {
-					this.fuwulist = res.response.data
-				})
-			},
-			changeswitch(e) {
-				this.$u.post('/Facilitator/setOrdersStatus', {
-					content: {
-						is_orders: e ? 1 : 0
-					}
-				}).then(res => {
-					this.$u.toast(res.msg)
-					setTimeout(() => {
-						this.getuser()
-					},800)
-				})
-			},
-			changetime(e) {
-				this.$u.post('/Facilitator/setOrdersTime', {
-					content: {
-						orders_state_time: this.timedata[0][e.detail.value[0]],
-						orders_end_time: this.timedata[1][e.detail.value[1]]
-					}
-				}).then(res => {
-					this.$u.toast(res.msg)
-					if (res.code == 0) {
-						setTimeout(() => {
-							this.getuser()
-						}, 800)
-					}
-				})
-			},
-			getuser() {
-				this.$u.post('/User/getDetail').then(res => {
-					if (res.code == 0) {
-						this.userdata = res.response
-						if (this.userdata.facilitator.is_orders == 0) {
-							this.checked = false
-						} else {
-							this.checked = true
-						}
-						this.jiedantime = this.userdata.facilitator.orders_state_time + "至" + this.userdata
-							.facilitator.orders_end_time
-					} else {
-						this.$u.toast(res.msg)
-						this.userdata = {}
-						this.$tologin(res.msg)
-					}
-				})
-			},
-			totips(){
-				uni.navigateTo({
-					url:"../mine/all-tips?type=2"
-				})
+		onPullDownRefresh() {
+			this.getad()
+			this.getuser()
+			this.getfuwu(this.fuwutype)
+			this.getallfuwu()
+		},
+		methods: {
+			tofuwu(){
+				uni.navigateTo({
+					url:"../mine/fuwu-info"
+				})
+			},
+			openbar(e){
+				this.$openad(this.list[e])
+			},
+			openad(e){
+				this.$openad(this.swiper[e])
+			},
+			async getad(){
+				var {response:{data}} = await this.$u.post('/Advertise/all',{
+					content:{
+						business:1,
+						device_type:2
+					}
+				})
+				data.forEach(val => {
+					if(val.type == 1){
+						this.swiper = val.advertise
+					}
+					if(val.type == 2){
+						this.list = val.advertise
+					}
+				})
+				console.log(this.list);
+			},
+			getallfuwu(){
+				this.$u.post('/FacilitatorExamine/allClassify').then(res => {
+					uni.stopPullDownRefresh()
+					this.allfuwu = res.response.data
+				})
+			},
+			toinfo(id){
+				uni.navigateTo({
+					url:"../mine/kaitong-fuwu?id=" + id
+				})
 			},
-			toxiaoxi(){
-				if (uni.getStorageSync("token")) {
-					uni.navigateTo({
-						url: "/pages/mine/xiaoxi"
-					})
-				} else {
-					uni.navigateTo({
-						url: "/pages/mine/login-wx"
-					})
-				}
+			getfuwu(type){
+				this.fuwutype = type
+				this.$u.post('/FacilitatorExamine/getQualificationsExamineList',{
+					content:{
+						status:this.fuwutype
+					}
+				}).then(res => {
+					this.fuwulist = res.response.data
+				})
+			},
+			changeswitch(e) {
+				this.$u.post('/Facilitator/setOrdersStatus', {
+					content: {
+						is_orders: e ? 1 : 0
+					}
+				}).then(res => {
+					this.$u.toast(res.msg)
+					setTimeout(() => {
+						this.getuser()
+					},800)
+				})
+			},
+			changetime(e) {
+				this.$u.post('/Facilitator/setOrdersTime', {
+					content: {
+						orders_state_time: this.timedata[0][e.detail.value[0]],
+						orders_end_time: this.timedata[1][e.detail.value[1]]
+					}
+				}).then(res => {
+					this.$u.toast(res.msg)
+					if (res.code == 0) {
+						setTimeout(() => {
+							this.getuser()
+						}, 800)
+					}
+				})
+			},
+			getuser() {
+				this.$u.post('/User/getDetail').then(res => {
+					if (res.code == 0) {
+						this.userdata = res.response
+						if (this.userdata.facilitator.is_orders == 0) {
+							this.checked = false
+						} else {
+							this.checked = true
+						}
+						this.jiedantime = this.userdata.facilitator.orders_state_time + "至" + this.userdata
+							.facilitator.orders_end_time
+					} else {
+						this.$u.toast(res.msg)
+						this.userdata = {}
+						this.$tologin(res.msg)
+					}
+				})
+			},
+			totips(){
+				uni.navigateTo({
+					url:"../mine/all-tips?type=2"
+				})
+			},
+			toxiaoxi(){
+				if (uni.getStorageSync("token")) {
+					uni.navigateTo({
+						url: "/pages/mine/xiaoxi"
+					})
+				} else {
+					uni.navigateTo({
+						url: "/pages/mine/login-wx"
+					})
+				}
 			}
 		}
 	}
@@ -242,12 +242,12 @@
 						margin-right: 33rpx;
 					}
 
-					.item-right {
+					.item-right {
 						padding: 10rpx;
 						flex: 1;
 						height: 126rpx;
 						border-radius: 20rpx;
-						border: 4rpx solid #09AA8C;
+						border: 4rpx solid #00a3a0;
 					}
 				}
 
@@ -276,15 +276,15 @@
 
 					.name {
 						font-size: 29rpx;
-						font-family: SimHei;
-						color: #08AA8C;
+						font-family: SimHei;
+						color: #00a3a0;
 					}
 
 					.image {
 						width: 124rpx;
 						height: 124rpx;
 						border-radius: 20rpx;
-						// background-color: #08AA8C;
+						// background-color: #00a3a0;
 						position: relative;
 						margin-bottom: 10rpx;
 
@@ -312,7 +312,7 @@
 							color: #E60012;
 						}
 
-						.text2 {
+						.text2 {
 							color: #E60012;
 							// color: rgba(8, 170, 140, 1);
 						}
@@ -333,8 +333,8 @@
 				}
 
 				.text {
-					color: #08AA8C;
-					border-bottom: 7rpx solid #08AA8C;
+					color: #00a3a0;
+					border-bottom: 7rpx solid #00a3a0;
 				}
 			}
 
@@ -401,7 +401,7 @@
 			padding: 0 32rpx;
 
 			.text1 {
-				font-size: 28rpx;
+				font-size: 28rpx;
 				color: #707070;
 				margin-right: 60rpx;
 			}
@@ -427,4 +427,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/index/change-address.vue

@@ -18,7 +18,7 @@
 			</view>
 			<view class="save-address u-flex u-col-center u-row-right">
 				<text class="text1">同时保存到我的地址</text>
-				<u-switch v-model="checked" active-color="#09AA8C" size="40"></u-switch>
+				<u-switch v-model="checked" active-color="#00a3a0" size="40"></u-switch>
 			</view>
 			<x-button :width="180" :height="49" fontSize="27rpx" @click="changeadd">确认地址</x-button>
 		</view>
@@ -36,7 +36,7 @@
 					<text>{{item.phone}}</text>
 				</view>
 				<view class="add-text">
-					{{item.province}}{{item.city}}{{item.area}}{{item.location_address}}{{item.address}}
+					{{item.location_address}}{{item.address}}
 				</view>
 			</view>
 		</view>
@@ -61,12 +61,12 @@
 		},
 		onLoad(option) {
 			var obj = JSON.parse(decodeURIComponent(option.obj))
-			// console.log(obj);
-			this.addresstext = obj.addressdesc
-			this.phone = obj.addressphone
-			this.address = obj.addresstext
-			this.lat = obj.latitude
-			this.lng = obj.longitude
+			// console.log(obj);
+			this.addresstext = obj.addressdesc
+			this.phone = obj.addressphone
+			this.address = obj.addresstext
+			this.lat = obj.latitude
+			this.lng = obj.longitude
 			this.name = obj.name
 			this.getlist()
 		},
@@ -106,11 +106,11 @@
 				const eventChannel = this.getOpenerEventChannel();
 				eventChannel.emit('changeaddress', {
 					id: item.id,
-					address: `${item.province}${item.city}${item.area}${item.location_address}`,
+					address: `${item.location_address}`,
 					addressdesc:item.address,
 					name: item.name,
-					phone: item.phone,
-					lat:item.lat,
+					phone: item.phone,
+					lat:item.lat,
 					lng:item.lng
 				});
 				uni.navigateBack()
@@ -153,17 +153,18 @@
 					if (res.code == 0) {
 						const eventChannel = this.getOpenerEventChannel();
 						eventChannel.emit('changeaddress', {
-							id: res.response.id,
-							address: `${res.response.province}${res.response.city}${res.response.area}${res.response.location_address}`,
-							addressdesc:res.response.address,
-							name: res.response.name,
-							phone: res.response.phone,
-							lat:res.response.lat,
+							id: res.response.id,
+							address: `${res.response.location_address}`,
+							addressdesc:res.response.address,
+							name: res.response.name,
+							phone: res.response.phone,
+							lat:res.response.lat,
 							lng:res.response.lng
 						});
 						uni.navigateBack()
 					}else{
-						this.$tologin(res.msg)
+						this.$u.toast(res.msg)
+						this.$tologin(res.msg)
 					}
 				})
 			},
@@ -174,14 +175,14 @@
 						list_type: 'page',
 						page: this.page
 					}
-				}).then(res => {
+				}).then(res => {
 					
 					this.count = res.response.count
 					if (this.page == 1) {
 						this.list = res.response.data
 					} else {
 						this.list = this.list.concat(res.response.data)
-					}
+					}
 					this.$tologin(res.msg)
 				})
 			},
@@ -228,7 +229,7 @@
 					font-size: 27rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					color: #08AA8C;
+					color: #00a3a0;
 					border-bottom: 1rpx solid #FAD445;
 					margin-bottom: 20rpx;
 
@@ -301,4 +302,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/index/daijia.vue

@@ -9,7 +9,7 @@
 				<u-icon name="phone-fill" color="#0DA98C" size="36" @click="getfocus"></u-icon>
 				<!-- <image class="image1" src="../../static/images/map1-1.png" mode=""></image> -->
 				<input class="input" type="number" placeholder="请输入手机号" :focus="focus" @blur="focus = false" v-model="phone" />
-				<image class="image2" src="../../static/images/mine1-4.png" @click="getfocus" mode=""></image>
+				<image class="image2" src="../../static/images/mine1-7.png" @click="getfocus" mode=""></image>
 			</view>
 			<view @click="openmap">
 				<view class="qidian-box u-flex u-col-top">
@@ -20,6 +20,9 @@
 					(填写或选择出发位置)
 				</view>
 			</view>
+			<view class="isfapiao u-flex u-col-center u-row-right">
+				<u-checkbox v-model="isfapiao" active-color="#00a3a0">需要发票</u-checkbox>
+			</view>
 			<view class="tips" @tap="toxieyi(12)">
 				计价方法和计价介绍
 			</view>
@@ -53,8 +56,10 @@
 				phone: '',
 				xieyi: false,
 				focus: false,
+				isfapiao: false,
 				show: false,
-				content: ''
+				content: '',
+				
 			}
 		},
 		onLoad() {
@@ -122,6 +127,7 @@
 						start_lng: this.longitude1,
 						start_location_address: this.addresstext,
 						start_phone: this.phone,
+						is_invoice: this.isfapiao == false ? 0 : 1
 					}
 				}).then(res => {
 					if (res.code == 0) {
@@ -156,7 +162,7 @@
 							})
 						}
 					} else {
-						this.$u.toast(res.msg)
+						this.$u.toast(res.msg)
 						this.$tologin(res.msg)
 					}
 				})
@@ -245,6 +251,11 @@
 		min-height: 100vh;
 		background-color: #fff;
 
+		.isfapiao {
+			padding: 0 24rpx;
+			margin: 20rpx 0;
+		}
+		
 		.xieyi-box {
 			padding: 0 24rpx;
 			margin: 20rpx 0;
@@ -253,13 +264,13 @@
 				color: rgba(8, 170, 140, 1);
 			}
 		}
-		.tips {
-			text-align: right;
-			font-size: 25rpx;
-			font-family: SimHei;
-			font-weight: 400;
-			padding: 20rpx 24rpx 0 24rpx;
-			color: #08AA8C;
+		.tips {
+			text-align: right;
+			font-size: 25rpx;
+			font-family: SimHei;
+			font-weight: 400;
+			padding: 20rpx 24rpx 0 24rpx;
+			color: #00a3a0;
 		}
 		.map-down {
 			padding: 0 30rpx;
@@ -345,4 +356,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/index/home.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="home">
+	<view class="home">
 		<x-navbar title="首页" ref="nav" :active="0"></x-navbar>
 		<view class="notice-box" v-if="list.length > 0">
 			<u-notice-bar fontSize="25" @click="openbar" mode="vertical" :list="list" bg-color="#fff" color="#000"></u-notice-bar>
@@ -10,7 +10,7 @@
 		<view class="tips-box u-flex u-col-center u-flex-wrap u-row-around">
 			<view class="item u-flex-col u-col-center u-row-center" @tap="totabs(item)" v-for="(item,index) in tabslist" :key='index'>
 				<image :src="item.advertise_image" mode="aspectFit"></image>
-				<view class="text">{{item.advertise_name}}</view>
+				<view class="text" style="color: black;font-size: 28rpx;"><b>{{item.advertise_name}}</b></view>
 			</view>
 			<!-- <view style="width: 186rpx;"></view> -->
 			<!-- <view style="width: 186rpx;"></view> -->
@@ -28,12 +28,12 @@
 				</view>
 				<view class="u-flex-col text">
 					<text class="text1" style="color: rgba(98, 98, 98, 1);" v-if="item.advertise_type == 5">{{item.advertise_details}}</text>
-					<text class="text1" v-if="item.advertise_type == 12">{{item.business_product.desc}}</text>
-					<view class="goods-down u-flex u-col-center" v-if="item.advertise_type == 12">
-						<text>¥{{item.business_product.show_sale_price}}</text>
-						<text>门市价¥{{item.business_product.show_original_price}}</text>
-						<text>销量{{item.business_product.show_sales_number}}</text>
-						<!-- <text>10.2公里</text> -->
+					<text class="text1" v-if="item.advertise_type == 12">{{item.business_product.desc}}</text>
+					<view class="goods-down u-flex u-col-center" v-if="item.advertise_type == 12">
+						<text>¥{{item.business_product.show_sale_price}}</text>
+						<text>门市价¥{{item.business_product.show_original_price}}</text>
+						<text>销量{{item.business_product.show_sales_number}}</text>
+						<!-- <text>10.2公里</text> -->
 					</view>
 				</view>
 			</view>
@@ -99,7 +99,7 @@
 					</view>
 				</template>
 			</u-waterfall>
-		</view>
+		</view>
 		<x-tabbar ref="tabbar"></x-tabbar>
 	</view>
 </template>
@@ -111,7 +111,7 @@
 				list: [],
 				swiper: [],
 				tabslist: [],
-				flowList: [],
+				flowList: [],
 				hotlist:[]
 			}
 		},
@@ -120,102 +120,102 @@
 				this.getlist()
 			}, 200) */
 			this.getad()
-		},
-		onPullDownRefresh() {
-			this.getad()
-		},
-		onShow() {
-			if (uni.getStorageSync("token")) {
-				this.$u.post('/UserMessage/getMessageReadFalseCount').then(res => {
-					if (res.code == 0) {
-						this.$refs.nav.count = res.response.count
-					}
-				})
-				this.getorder()
-			}else{
-				this.$refs.nav.count = 0
-				this.$refs.tabbar.setbadge(0)
-				uni.removeTabBarBadge({
-					index:1,
-				})
-			}
 		},
-		methods: {
-			getorder(){
-				this.$u.post('/Order/getOrderStatusCount').then(res => {
-					var num = 0
-					num = num + res.response.facilitator.pending_count
-					num = num + res.response.facilitator.received_count
-					num = num + res.response.user.comments_count
-					num = num + res.response.user.pending_count
-					num = num + res.response.user.received_count
-					if(num > 0){
-						uni.setTabBarBadge({
-							text:num.toFixed(0).toString(),
-							index:1,
-						})
-						this.$refs.tabbar.setbadge(num.toFixed(0).toString())
-					}else{
-						uni.removeTabBarBadge({
-							index:1,
-						})
-						this.$refs.tabbar.setbadge(0)
-					}
-				})
-			},
-			openbar(e){
-				this.$openad(this.list[e])
-			},
-			openad(e){
-				this.$openad(this.swiper[e])
-			},
-			async getad(){
-				var {response:{data}} = await this.$u.post('/Advertise/all',{
-					content:{
-						business:1,
-						device_type:2
-					}
-				})
-				uni.stopPullDownRefresh()
-				data.forEach(val => {
-					if(val.type == 1){
-						this.swiper = val.advertise
-					}
-					if(val.type == 2){
-						this.list = val.advertise
-					}
-					if(val.type == 3){
-						this.tabslist =  val.advertise
-					}
-					if(val.type == 5){
-						this.hotlist =  val.advertise
-					}
-				})
-				console.log(this.list);
-			},
-			totabs(item){
-				this.$openad(item)
-				// if(index == 0){
-				// 	uni.navigateTo({
-				// 		url:"./weixiu"
-				// 	})
-				// }else if(index == 1){
-				// 	uni.navigateTo({
-				// 		url:"./daijia"
-				// 	})
-				// }else if(index == 2){
-				// 	uni.navigateTo({
-				// 		url:"./paotui"
-				// 	})
-				// }else if(index == 3){
-				// 	uni.switchTab({
-				// 		url:"../shop/shop"
-				// 	})
-				// }else{
-				// 	uni.navigateTo({
-				// 		url:"./other-tabs"
-				// 	})
-				// }
+		onPullDownRefresh() {
+			this.getad()
+		},
+		onShow() {
+			if (uni.getStorageSync("token")) {
+				this.$u.post('/UserMessage/getMessageReadFalseCount').then(res => {
+					if (res.code == 0) {
+						this.$refs.nav.count = res.response.count
+					}
+				})
+				this.getorder()
+			}else{
+				this.$refs.nav.count = 0
+				this.$refs.tabbar.setbadge(0)
+				uni.removeTabBarBadge({
+					index:1,
+				})
+			}
+		},
+		methods: {
+			getorder(){
+				this.$u.post('/Order/getOrderStatusCount').then(res => {
+					var num = 0
+					num = num + res.response.facilitator.pending_count
+					num = num + res.response.facilitator.received_count
+					num = num + res.response.user.comments_count
+					num = num + res.response.user.pending_count
+					num = num + res.response.user.received_count
+					if(num > 0){
+						uni.setTabBarBadge({
+							text:num.toFixed(0).toString(),
+							index:1,
+						})
+						this.$refs.tabbar.setbadge(num.toFixed(0).toString())
+					}else{
+						uni.removeTabBarBadge({
+							index:1,
+						})
+						this.$refs.tabbar.setbadge(0)
+					}
+				})
+			},
+			openbar(e){
+				this.$openad(this.list[e])
+			},
+			openad(e){
+				this.$openad(this.swiper[e])
+			},
+			async getad(){
+				var {response:{data}} = await this.$u.post('/Advertise/all',{
+					content:{
+						business:1,
+						device_type:2
+					}
+				})
+				uni.stopPullDownRefresh()
+				data.forEach(val => {
+					if(val.type == 1){
+						this.swiper = val.advertise
+					}
+					if(val.type == 2){
+						this.list = val.advertise
+					}
+					if(val.type == 3){
+						this.tabslist =  val.advertise
+					}
+					if(val.type == 5){
+						this.hotlist =  val.advertise
+					}
+				})
+				console.log(this.list);
+			},
+			totabs(item){
+				this.$openad(item)
+				// if(index == 0){
+				// 	uni.navigateTo({
+				// 		url:"./weixiu"
+				// 	})
+				// }else if(index == 1){
+				// 	uni.navigateTo({
+				// 		url:"./daijia"
+				// 	})
+				// }else if(index == 2){
+				// 	uni.navigateTo({
+				// 		url:"./paotui"
+				// 	})
+				// }else if(index == 3){
+				// 	uni.switchTab({
+				// 		url:"../shop/shop"
+				// 	})
+				// }else{
+				// 	uni.navigateTo({
+				// 		url:"./other-tabs"
+				// 	})
+				// }
 			},
 			getlist() {
 				for (let i = 0; i < 10; i++) {
@@ -246,7 +246,7 @@
 					padding: 0 20rpx 20rpx 20rpx;
 
 					text:first-child {
-						color: #E8380D;
+						color: #ff0000;
 						font-size: 27rpx;
 					}
 
@@ -256,7 +256,7 @@
 						text-align: center;
 						line-height: 42rpx;
 						border-radius: 100rpx;
-						background-color: #F4CC14;
+						background-color: #fff;
 						font-size: 24rpx;
 					}
 				}
@@ -298,7 +298,7 @@
 						font-size: 24rpx;
 
 						text:first-child {
-							background-color: #F6BC00;
+							background-color: #fff;
 							padding: 4rpx 8rpx;
 						}
 
@@ -313,7 +313,7 @@
 					image {
 						width: 344rpx;
 						height: 344rpx;
-						background-color: #2AA47F;
+						background-color: #00a3a0;
 					}
 				}
 			}
@@ -328,7 +328,7 @@
 				overflow: hidden;
 
 				.text {
-					background-color: #F4CC14;
+					background-color: #fff;
 					padding: 18rpx 30rpx;
 
 					.text1 {
@@ -337,34 +337,34 @@
 						-webkit-box-orient: vertical;
 						-webkit-line-clamp: 2;
 						overflow: hidden;
-					}
-					.goods-down{
-						text:first-child{
-							color: red;
-							font-size: 34rpx;
-							margin-right: 10rpx;
-						}
-						text:nth-child(2){
-							font-size: 24rpx;
-							text-decoration: line-through;
-							margin-right: 10rpx;
-						}
-						text:nth-child(3){
-							font-size: 30rpx;
-							color: #333333;
-							flex: 1;
-						}
-						text:nth-child(4){
-							font-size: 28rpx;
-							color: #28A47F;
-						}
+					}
+					.goods-down{
+						text:first-child{
+							color: red;
+							font-size: 34rpx;
+							margin-right: 10rpx;
+						}
+						text:nth-child(2){
+							font-size: 24rpx;
+							text-decoration: line-through;
+							margin-right: 10rpx;
+						}
+						text:nth-child(3){
+							font-size: 30rpx;
+							color: #333333;
+							flex: 1;
+						}
+						text:nth-child(4){
+							font-size: 28rpx;
+							color: #28A47F;
+						}
 					}
 				}
 
 				.image {
 					width: 100%;
 					height: 347rpx;
-					background-color: #2AA47F;
+					background-color: #00a3a0;
 					position: relative;
 
 					image {
@@ -377,7 +377,7 @@
 						bottom: 2rpx;
 						left: 0;
 						border-radius: 10rpx 10rpx 0 0;
-						background-color: #F4CC14;
+						background-color: #fff;
 						padding: 5rpx 30rpx;
 					}
 				}
@@ -401,12 +401,12 @@
 					// left: 50%;
 					// transform: translate(-50%, -50%);
 					// width: 75rpx;
-					// height: 47rpx;
+					// height: 47rpx;
 					margin-top: 10rpx;
 					text-align: center;
 					// line-height: 47rpx;
 					// border-radius: 8rpx;
-					// background-color: #F4CC17;
+					// background-color: #fff;
 				}
 
 				image {
@@ -417,4 +417,4 @@
 		}
 
 	}
-</style>
+</style>

pages/index/paotui.vue

@@ -74,12 +74,12 @@
 					<text class="text1">送达时间：</text>
 					<input type="text" placeholder="选择时间" v-model="time" :disabled="true" />
 					<u-icon name="arrow-right"></u-icon>
-				</view>
-				<view style="color: #2AA47F;text-align: right;padding: 20rpx 10rpx 0 0;" @click="toxieyi(17)">
-					计价方法和计价介绍
+				</view>
+				<view style="color: #00a3a0;text-align: right;padding: 20rpx 10rpx 0 0;" @click="toxieyi(17)">
+					计价方法和计价介绍
 				</view>
 				<view class="xieyi-box u-flex u-col-center u-row-right">
-					<u-checkbox v-model="checked" active-color="#09AA8C"></u-checkbox>
+					<u-checkbox v-model="checked" active-color="#00a3a0"></u-checkbox>
 					<text @tap="checked = !checked">同意</text>
 					<text style="color: #3BBBA3;" @click="toxieyi(6)">《跑腿服务协议》</text>
 				</view>
@@ -92,7 +92,7 @@
 					<view class="address-item" @tap="toaddress(1)">
 						<view class="top u-flex u-col-center">
 							<text class="text1" style="background-color: #029FE9;">起</text>
-							<text class="text2">{{addresstext1 || '请选择地址'}}</text>
+							<text class="text2">{{addresstext1 || '请选择地址'}}{{addressdesc1 || ''}}</text>
 							<input type="text" class="text3" placeholder="填写联系电话" :disabled="true" v-model="addressphone1" />
 							<u-icon name="arrow-right"></u-icon>
 						</view>
@@ -103,7 +103,7 @@
 					<view class="address-item" @tap="toaddress(2)">
 						<view class="top u-flex u-col-center">
 							<text class="text1" style="background-color: #E8380A;">终</text>
-							<text class="text2">{{addresstext2 || '请选择地址'}}</text>
+							<text class="text2">{{addresstext2 || '请选择地址'}}{{addressdesc2 || ''}}</text>
 							<input type="text" class="text3" placeholder="填写联系电话" :disabled="true" v-model="addressphone2" />
 							<u-icon name="arrow-right"></u-icon>
 						</view>
@@ -127,16 +127,16 @@
 				<view class="zhongliang u-flex u-col-center u-row-between">
 					<text class="text1">物品重量:</text>
 					<view style="flex: 1;padding: 0 20rpx;">
-						<u-slider v-model="value" activeColor="#09AA8C" height="15" :step="6.66"></u-slider>
+						<u-slider v-model="value" activeColor="#00a3a0" height="15" :step="6.66"></u-slider>
 					</view>
 					<view class="text2" v-if="(parseInt(value / 6.6) + 5) <= 5">(5公斤以下)</view>
 					<view class="text2" v-else>({{parseInt(value / 6.6) + 5}}公斤)</view>
-				</view>
-				<view style="color: #2AA47F;text-align: right;padding: 20rpx 10rpx 0 0;" @click="toxieyi(17)">
-					计价方法和计价介绍
+				</view>
+				<view style="color: #00a3a0;text-align: right;padding: 20rpx 10rpx 0 0;" @click="toxieyi(17)">
+					计价方法和计价介绍
 				</view>
 				<view class="xieyi-box u-flex u-col-center u-row-right">
-					<u-checkbox v-model="checked" active-color="#09AA8C"></u-checkbox>
+					<u-checkbox v-model="checked" active-color="#00a3a0"></u-checkbox>
 					<text @tap="checked = !checked">同意</text>
 					<text style="color: #3BBBA3;" @click="toxieyi(6)">《跑腿服务协议》</text>
 				</view>
@@ -147,11 +147,11 @@
 		</view>
 		
 		<u-select v-model="show" mode="mutil-column-auto" :list="timelist" @confirm="confirm"></u-select>
-		<u-select v-model="showwupin" :list="wupinlist" @confirm="confirm1" value-name="id" label-name="title"></u-select>
-		<u-modal v-model="showsdk" :show-cancel-button="true" @confirm="confirm2" @cancel="cancel">
-			<view class="slot-content" style="padding:30rpx;">
-				<u-parse :html="content"></u-parse>
-			</view>
+		<u-select v-model="showwupin" :list="wupinlist" @confirm="confirm1" value-name="id" label-name="title"></u-select>
+		<u-modal v-model="showsdk" :show-cancel-button="true" @confirm="confirm2" @cancel="cancel">
+			<view class="slot-content" style="padding:30rpx;">
+				<u-parse :html="content"></u-parse>
+			</view>
 		</u-modal>
 	</view>
 </template>
@@ -169,7 +169,7 @@
 				addressdesc1: '',
 				addresstext1: '',
 				addresstextid1: '',
-				addressphone1: '',
+				addressphone1: '',
 				name1:'',
 				// 终点
 				latitude2: '',
@@ -177,7 +177,7 @@
 				addressdesc2: '',
 				addresstext2: '',
 				addresstextid2: '',
-				addressphone2: '',
+				addressphone2: '',
 				name2:"",
 
 				type: 1,
@@ -198,50 +198,50 @@
 				},
 				imglist_code: [],
 				price: '',
-				fapiao: '',
-				showsdk: false,
+				fapiao: '',
+				showsdk: false,
 				content: ''
 			}
 		},
-		onLoad() {
-			this.$u.post('Auth/getProtocol', {
-				content: {
-					type: 22
-				}
-			}).then(res => {
-				this.content = res.response.content
-				if (!uni.getStorageSync("issdk")) {
-					this.showsdk = true
-				} else {
-					this.tostart()
-				}
-			})
+		onLoad() {
+			this.$u.post('Auth/getProtocol', {
+				content: {
+					type: 22
+				}
+			}).then(res => {
+				this.content = res.response.content
+				if (!uni.getStorageSync("issdk")) {
+					this.showsdk = true
+				} else {
+					this.tostart()
+				}
+			})
 		},
-		methods: {
-			cancel() {
-				uni.navigateBack()
-			},
-			confirm2() {
-				wx.setStorageSync("issdk", true)
-				this.tostart()
-			},
-			tostart(){
-				this.gettype()
-				this.gettime()
-				this.myAmapFun.getRegeo({
-					success: (res) => {
-						console.log(res);
-						this.latitude = res[0].latitude
-						this.longitude = res[0].longitude
-						this.latitude1 = res[0].latitude
-						this.longitude1 = res[0].longitude
-						this.addresstext1 = res[0].name
-						this.addressdesc1 = res[0].desc
-					},
-					fail: (err) => {
-						console.log(err);
-					}
-				})
+		methods: {
+			cancel() {
+				uni.navigateBack()
+			},
+			confirm2() {
+				wx.setStorageSync("issdk", true)
+				this.tostart()
+			},
+			tostart(){
+				this.gettype()
+				this.gettime()
+				this.myAmapFun.getRegeo({
+					success: (res) => {
+						console.log(res);
+						this.latitude = res[0].latitude
+						this.longitude = res[0].longitude
+						this.latitude1 = res[0].latitude
+						this.longitude1 = res[0].longitude
+						this.addresstext1 = res[0].name
+						this.addressdesc1 = res[0].desc
+					},
+					fail: (err) => {
+						console.log(err);
+					}
+				})
 			},
 			getlocation() {
 				this.latitude1 = this.latitude
@@ -311,7 +311,11 @@
 				this.time = `${e[0].value}-${e[0].label}-${e[1].label} ${e[2].label}`
 			},
 			gettime() {
-				this.$u.post('/Order/getComeTime').then(res => {
+				this.$u.post('/Order/getComeTime', {
+					content: {
+						type: 2
+					}
+				}).then(res => {
 					this.timelist = []
 					res.response.data.forEach(month => {
 						var month1 = []
@@ -341,7 +345,7 @@
 					this.wupinlist = res.response.data
 				})
 			},
-			xiadan(type) {
+			xiadan(type) {
 				if (this.type == 1) {
 					if (!this.addresstextid1 || !this.addresstextid1) {
 						this.$u.toast("请完善地址信息")
@@ -401,7 +405,7 @@
 							}
 
 						} else {
-							this.$u.toast(res.msg)
+							this.$u.toast(res.msg)
 							this.$tologin(res.msg)
 						}
 					})
@@ -464,7 +468,7 @@
 							}
 
 						} else {
-							this.$u.toast(res.msg)
+							this.$u.toast(res.msg)
 							this.$tologin(res.msg)
 						}
 					})
@@ -543,7 +547,7 @@
 							}
 
 						} else {
-							this.$u.toast(res.msg)
+							this.$u.toast(res.msg)
 							this.$tologin(res.msg)
 						}
 					})
@@ -568,23 +572,23 @@
 						name:type == 1 ? this.name1 : this.name2
 					}))}`,
 					events: {
-						changeaddress: (res) => {
+						changeaddress: (res) => {
 							console.log(res);
 							if (type == 1) {
 								this.addresstext1 = res.address
 								this.addressdesc1 = res.addressdesc
 								this.addresstextid1 = res.id
-								this.addressphone1 = res.phone
-								this.latitude1 = res.lat
-								this.longitude1 = res.lng
+								this.addressphone1 = res.phone
+								this.latitude1 = res.lat
+								this.longitude1 = res.lng
 								this.name1 = res.name
 							} else {
-								this.addresstext2 = res.address
+								this.addresstext2 = res.address
 								this.addressdesc2 = res.addressdesc
 								this.addresstextid2 = res.id
-								this.addressphone2 = res.phone
-								this.latitude2 = res.lat
-								this.longitude2 = res.lng
+								this.addressphone2 = res.phone
+								this.latitude2 = res.lat
+								this.longitude2 = res.lng
 								this.name2 = res.name
 							}
 						}
@@ -639,7 +643,7 @@
 
 				input {
 					flex: 1;
-					border-bottom: 4rpx solid #09AA8C;
+					border-bottom: 4rpx solid #00a3a0;
 				}
 			}
 
@@ -780,7 +784,7 @@
 
 			.tabs-box {
 				height: 67rpx;
-				border-bottom: 2rpx solid #09AA8C;
+				border-bottom: 2rpx solid #00a3a0;
 
 				text {
 					flex: 1;
@@ -790,7 +794,7 @@
 				}
 
 				.text {
-					background-color: #09AA8C;
+					background-color: #00a3a0;
 					color: #fff;
 				}
 			}
@@ -819,4 +823,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/index/weixiu.vue

@@ -30,11 +30,11 @@
 				<u-icon name="arrow-down-fill"></u-icon>
 			</view>
 		</picker>
-		<view class="upload-img u-flex u-col-center u-flex-wrap">
-			<u-upload :custom-btn="true" width="154rpx" height="154rpx" :action="url" :show-progress="true" :header="header" :formData="$getdata()"
-				:max-count="8" @on-success="uploadsuccess" @on-remove="delimg" name="img" @on-uploaded="uploadover"
-				@on-choose-complete='uploadstart'>
-				<image class="upload" slot="addBtn" src="../../static/images/648.png" mode=""></image>
+		<view class="upload-img u-flex u-col-center u-flex-wrap">
+			<u-upload :custom-btn="true" width="154rpx" height="154rpx" :action="url" :show-progress="true" :header="header" :formData="$getdata()"
+				:max-count="8" @on-success="uploadsuccess" @on-remove="delimg" name="img" @on-uploaded="uploadover"
+				@on-choose-complete='uploadstart'>
+				<image class="upload" slot="addBtn" src="../../static/images/648.png" mode=""></image>
 			</u-upload>
 		</view>
 		<view class="upload-tips">
@@ -48,23 +48,23 @@
 		</view>
 		<view class="type-box u-flex u-col-center">
 			<text @click="changetext(item.title)" v-for="(item,index) in guzhanglist" :key="index">{{item.title}}</text>
-		</view>
-		<view style="text-align: right;color: rgba(8, 170, 140, 1);padding:0 30rpx 20rpx 30rpx;" @click="toxieyi(18)">
-			计价方法和计价介绍
-		</view>
-		<view class="xieyi-box u-flex u-col-center u-row-right">
-			<u-checkbox v-model="xieyi" active-color="rgba(8, 170, 140, 1)">同意</u-checkbox>
-			<text class="text1" @tap="toxieyi(13)">《水电维修服务协议》</text>
+		</view>
+		<view style="text-align: right;color: rgba(8, 170, 140, 1);padding:0 30rpx 20rpx 30rpx;" @click="toxieyi(18)">
+			计价方法和计价介绍
+		</view>
+		<view class="xieyi-box u-flex u-col-center u-row-right">
+			<u-checkbox v-model="xieyi" active-color="rgba(8, 170, 140, 1)">同意</u-checkbox>
+			<text class="text1" @tap="toxieyi(13)">《水电维修服务协议》</text>
 		</view>
 		<view style="margin: 56rpx 0;">
 			<x-button color="#000" @click="yuyue(1)">确认预约</x-button>
-		</view>
+		</view>
 		
-		<u-select v-model="show" mode="mutil-column-auto" :list="timelist" @confirm="confirm"></u-select>
-		<u-modal v-model="showsdk" :show-cancel-button="true" @confirm="confirm1" @cancel="cancel">
-			<view class="slot-content" style="padding:30rpx;">
-				<u-parse :html="content"></u-parse>
-			</view>
+		<u-select v-model="show" mode="mutil-column-auto" :list="timelist" @confirm="confirm"></u-select>
+		<u-modal v-model="showsdk" :show-cancel-button="true" @confirm="confirm1" @cancel="cancel">
+			<view class="slot-content" style="padding:30rpx;">
+				<u-parse :html="content"></u-parse>
+			</view>
 		</u-modal>
 	</view>
 </template>
@@ -80,153 +80,153 @@
 				typechildid: '',
 				timelist: [],
 				time: '',
-				show: false,
-				guzhanglist:[],
-				guzhang:0,
-				text:'',
-				address:{},
-				url: this.$url + '/Image/uploadImg',
-				header: {
-					token: uni.getStorageSync("token")
-				},
-				imglist_code:[],
-				xieyi:false,
-				showsdk: false,
+				show: false,
+				guzhanglist:[],
+				guzhang:0,
+				text:'',
+				address:{},
+				url: this.$url + '/Image/uploadImg',
+				header: {
+					token: uni.getStorageSync("token")
+				},
+				imglist_code:[],
+				xieyi:false,
+				showsdk: false,
 				content: ''
 			}
 		},
-		onLoad() {
-			this.$u.post('Auth/getProtocol', {
-				content: {
-					type: 22
-				}
-			}).then(res => {
-				this.content = res.response.content
-				if (!uni.getStorageSync("issdk")) {
-					this.showsdk = true
-				} else {
-					this.getdata()
-				}
+		onLoad() {
+			this.$u.post('Auth/getProtocol', {
+				content: {
+					type: 22
+				}
+			}).then(res => {
+				this.content = res.response.content
+				if (!uni.getStorageSync("issdk")) {
+					this.showsdk = true
+				} else {
+					this.getdata()
+				}
 			})
-			
-		},
-		onShow() {
-			if(!this.address.id){
-				this.getaddress()
-			}
+			
+		},
+		onShow() {
+			if(!this.address.id){
+				this.getaddress()
+			}
 		},
-		methods: {
-			cancel() {
-				uni.navigateBack()
-			},
-			confirm1() {
-				wx.setStorageSync("issdk", true)
-				this.getdata()
-			},
-			toxieyi(type) {
-				uni.navigateTo({
-					url: "../mine/all-tips?type=" + type
-				})
-			},
-			yuyue(type){
-				if(!this.xieyi){
-					this.$u.toast("请勾选协议")
-					return
-				}
-				if(!this.address.id){
-					this.$u.toast("请选择地址")
-					return
-				}
-				// if(this.imglist_code.length == 0){
-				// 	this.$u.toast("请上传图片")
-				// 	return
-				// }
-				this.$u.post('/OrderRepair/add',{
-					content:{
-						is_check:type,
-						user_address_id:this.address.id,
-						classify_id:this.typechildid,
-						come_time:this.time,
-						remark:this.text,
-						image_gather_code:this.imglist_code
-					}
-				}).then(res => {
-					if(res.code == 0){
-						if(type == 1){
-							uni.showModal({
-								content:res.msg,
-								confirmText:"立即下单",
-								success: (res) => {
-									if(res.confirm){
-										this.yuyue(0)
-									}
-								}
-							})
-						}else{
-							var orderid = res.response.order_no
-							uni.showModal({
-								content:"下单成功",
-								confirmText:"查看详情",
-								cancelText:"返回首页",
-								success: (res) => {
-									if(res.confirm){
-										uni.navigateTo({
-											url:"../order/order-info?id=" + orderid
-										})
-									}else{
-										uni.switchTab({
-											url:"./home"
-										})
-									}
-								}
-							})
-						}
-						
-					}else{
-						this.$u.toast(res.msg)
-						this.$tologin(res.msg)
-					}
-				})
-			},
-			uploadstart() {
-				uni.showLoading({
-					mask: true,
-					title: "上传中"
-				})
-			},
-			uploadover() {
-				// console.log(123);
-				uni.hideLoading()
-			},
-			delimg(e) {
-				this.imglist_code.splice(e, 1)
-			},
-			uploadsuccess(e) {
-				// this.imglist.push(e.response.src)
-				this.imglist_code.push(e.response.code)
-				// console.log(e);
-			},
-			getaddress(){
-				this.$u.post('/UserAddress/list').then(res => {
-					this.address = res.response.data ? res.response.data[0] : {}
-				})
-			},
-			changetext(text){
-				this.text = this.text + text
+		methods: {
+			cancel() {
+				uni.navigateBack()
+			},
+			confirm1() {
+				wx.setStorageSync("issdk", true)
+				this.getdata()
+			},
+			toxieyi(type) {
+				uni.navigateTo({
+					url: "../mine/all-tips?type=" + type
+				})
+			},
+			yuyue(type){
+				if(!this.xieyi){
+					this.$u.toast("请勾选协议")
+					return
+				}
+				if(!this.address.id){
+					this.$u.toast("请选择地址")
+					return
+				}
+				// if(this.imglist_code.length == 0){
+				// 	this.$u.toast("请上传图片")
+				// 	return
+				// }
+				this.$u.post('/OrderRepair/add',{
+					content:{
+						is_check:type,
+						user_address_id:this.address.id,
+						classify_id:this.typechildid,
+						come_time:this.time,
+						remark:this.text,
+						image_gather_code:this.imglist_code
+					}
+				}).then(res => {
+					if(res.code == 0){
+						if(type == 1){
+							uni.showModal({
+								content:res.msg,
+								confirmText:"立即下单",
+								success: (res) => {
+									if(res.confirm){
+										this.yuyue(0)
+									}
+								}
+							})
+						}else{
+							var orderid = res.response.order_no
+							uni.showModal({
+								content:"下单成功",
+								confirmText:"查看详情",
+								cancelText:"返回首页",
+								success: (res) => {
+									if(res.confirm){
+										uni.navigateTo({
+											url:"../order/order-info?id=" + orderid
+										})
+									}else{
+										uni.switchTab({
+											url:"./home"
+										})
+									}
+								}
+							})
+						}
+						
+					}else{
+						this.$u.toast(res.msg)
+						this.$tologin(res.msg)
+					}
+				})
+			},
+			uploadstart() {
+				uni.showLoading({
+					mask: true,
+					title: "上传中"
+				})
+			},
+			uploadover() {
+				// console.log(123);
+				uni.hideLoading()
+			},
+			delimg(e) {
+				this.imglist_code.splice(e, 1)
+			},
+			uploadsuccess(e) {
+				// this.imglist.push(e.response.src)
+				this.imglist_code.push(e.response.code)
+				// console.log(e);
+			},
+			getaddress(){
+				this.$u.post('/UserAddress/list').then(res => {
+					this.address = res.response.data ? res.response.data[0] : {}
+				})
+			},
+			changetext(text){
+				this.text = this.text + text
 			},
 			confirm(e) {
 				this.time = `${e[0].value}-${e[0].label}-${e[1].label} ${e[2].label}`
 			},
 			changetypechild(e) {
 				this.typechildtext = this.typechild[e.detail.value].title
-				this.typechildid = this.typechild[e.detail.value].id
-				this.guzhanglist = this.typechild[e.detail.value].tag
+				this.typechildid = this.typechild[e.detail.value].id
+				this.guzhanglist = this.typechild[e.detail.value].tag
 			},
 			changetype(index) {
 				this.type = index
 				this.typechild = this.typelist[this.type].child
 				this.typechildtext = this.typechild[0].title
-				this.typechildid = this.typechild[0].id
+				this.typechildid = this.typechild[0].id
 				this.guzhanglist = this.typechild[0].tag
 			},
 			getdata() {
@@ -234,10 +234,14 @@
 					this.typelist = res.response.data
 					this.typechild = this.typelist[this.type].child
 					this.typechildtext = this.typechild[0].title
-					this.typechildid = this.typechild[0].id
+					this.typechildid = this.typechild[0].id
 					this.guzhanglist = this.typechild[0].tag
 				})
-				this.$u.post('/Order/getComeTime').then(res => {
+				this.$u.post('/Order/getComeTime', {
+					content: {
+						type: 0
+					}
+				}).then(res => {
 					this.timelist = []
 					res.response.data.forEach(month => {
 						var month1 = []
@@ -255,21 +259,22 @@
 						})
 						this.timelist.push({
 							label: month.month,
-							children: month1,
+							children: month1,
 							value:month.year
 						})
-					})
+					})
 					this.time = `${this.timelist[0].value}-${this.timelist[0].label}-${this.timelist[0].children[0].label} ${this.timelist[0].children[0].children[0].label}`
 				})
 			},
 			tochange() {
 				uni.navigateTo({
-					url: "../mine/address-list?type=1",
-					events:{
-						changeadd:(res)  => {
-							this.address = res
-						}
-					}
+					url: "../mine/address-list?type=1",
+					events:{
+						changeadd:(res)  => {
+							this.address = res
+						}
+					}
+					
 				})
 			}
 		}
@@ -277,14 +282,14 @@
 </script>
 
 <style lang="scss">
-	.weixiu {
-		.xieyi-box {
-			padding: 0 24rpx;
-			margin-bottom: 20rpx;
-		
-			.text1 {
-				color: rgba(8, 170, 140, 1);
-			}
+	.weixiu {
+		.xieyi-box {
+			padding: 0 24rpx;
+			margin-bottom: 20rpx;
+		
+			.text1 {
+				color: rgba(8, 170, 140, 1);
+			}
 		}
 		.textarea {
 			width: 685rpx;
@@ -332,16 +337,16 @@
 			text {
 				padding: 20rpx 26rpx;
 				border-radius: 10rpx;
-				border: 1rpx solid #09AA8C;
+				border: 1rpx solid #00a3a0;
 				font-size: 25rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 				margin-right: 20rpx;
 			}
 
 			.text {
-				background-color: #09AA8C;
+				background-color: #00a3a0;
 				color: #fff;
 			}
 		}
@@ -365,7 +370,7 @@
 
 			.right {
 				height: 61rpx;
-				background-color: #09AA8C;
+				background-color: #00a3a0;
 				padding: 0 10rpx;
 
 				image {
@@ -423,8 +428,8 @@
 				font-size: 31rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 	}
-</style>
+</style>

pages/mine/address-list.vue

@@ -124,8 +124,8 @@
 						} else {
 							this.list = this.list.concat(res.response.data)
 						}
-					}else{
-						this.$u.toast(res.msg)
+					}else{
+						this.$u.toast(res.msg)
 					}
 
 				})
@@ -151,7 +151,7 @@
 			line-height: 80rpx;
 			height: 80rpx;
 			color: #fff;
-			background-color: #09AA8C;
+			background-color: #00a3a0;
 			bottom: 20rpx;
 		}
 
@@ -171,7 +171,7 @@
 				font-size: 33rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 				margin: 19rpx 0;
 				text-align: right;
 			}
@@ -189,4 +189,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/address-set.vue

@@ -12,7 +12,7 @@
 			<view class="row-input u-flex u-col-center" @tap="openmap">
 				<text class="text">定位地址：</text>
 				<input type="text" placeholder="请选择地址" :disabled="true" v-model="address"/>
-				<u-icon name="arrow-right" color="#09AA8C"></u-icon>
+				<u-icon name="arrow-right" color="#00a3a0"></u-icon>
 			</view>
 		</view>
 		<view class="textarea">
@@ -20,7 +20,7 @@
 		</view>
 		<view class="moren-box u-flex u-col-center u-row-right">
 			<text class="text">默认地址</text>
-			<u-switch v-model="checked" active-color="#09AA8C"></u-switch>
+			<u-switch v-model="checked" active-color="#00a3a0"></u-switch>
 		</view>
 		<view class="text2">
 			<x-button @click="save">{{id ? '修改地址' : '保存地址'}}</x-button>
@@ -32,103 +32,103 @@
 	export default {
 		data() {
 			return {
-				checked: false,
-				name:'',
-				tel:'',
-				address:'',
-				addresstext:'',
-				latitude:'',
-				longitude:'',
+				checked: false,
+				name:'',
+				tel:'',
+				address:'',
+				addresstext:'',
+				latitude:'',
+				longitude:'',
 				id:''
 			}
 		},
 		onLoad(option) {
-			if(option.item){
-				var item = JSON.parse(decodeURIComponent(option.item))
-				this.name = item.name
-				this.tel = item.phone
-				this.address = item.address
-				this.addresstext = item.location_address
-				this.latitude = item.lat
-				this.longitude = item.lng
-				this.id = item.id
-				this.checked = item.is_default == 1 ? true : false
+			if(option.item){
+				var item = JSON.parse(decodeURIComponent(option.item))
+				this.name = item.name
+				this.tel = item.phone
+				this.address = item.address
+				this.addresstext = item.location_address
+				this.latitude = item.lat
+				this.longitude = item.lng
+				this.id = item.id
+				this.checked = item.is_default == 1 ? true : false
 			}
 		},
-		methods: {
-			save(){
-				if(!this.name){
-					this.$u.toast("请输入联系人")
-					return
-				}
-				if(!this.tel){
-					this.$u.toast("请输入手机号")
-					return
-				}
-				if(!this.address){
-					this.$u.toast("请选择地址")
-					return
-				}
-				if(!this.addresstext){
-					this.$u.toast("请输入详细地址")
-					return
-				}
-				if(this.id){
-					this.$u.post('/UserAddress/update',{
-						content:{
-							address:this.address,
-							id:this.id,
-							is_default:this.checked ? 1 : 0,
-							is_user_add:1,
-							lat:this.latitude,
-							lng:this.longitude,
-							location_address:this.addresstext,
-							name:this.name,
-							phone:this.tel,
-						}
-					}).then(res => {
-						this.$u.toast(res.msg)
-						if(res.code == 0){
-							setTimeout(() => {
-								uni.navigateBack()
-							},800)
-						}else{
-							this.$tologin(res.msg)
-						}
-					})
-				}else{
-					this.$u.post('/UserAddress/add',{
-						content:{
-							address:this.address,
-							is_default:this.checked ? 1 : 0,
-							is_user_add:1,
-							lat:this.latitude,
-							lng:this.longitude,
-							location_address:this.addresstext,
-							name:this.name,
-							phone:this.tel,
-						}
-					}).then(res => {
-						this.$u.toast(res.msg)
-						if(res.code == 0){
-							setTimeout(() => {
-								uni.navigateBack()
-							},800)
-						}
-					})
-				}
-				
+		methods: {
+			save(){
+				if(!this.name){
+					this.$u.toast("请输入联系人")
+					return
+				}
+				if(!this.tel){
+					this.$u.toast("请输入手机号")
+					return
+				}
+				if(!this.address){
+					this.$u.toast("请选择地址")
+					return
+				}
+				if(!this.addresstext){
+					this.$u.toast("请输入详细地址")
+					return
+				}
+				if(this.id){
+					this.$u.post('/UserAddress/update',{
+						content:{
+							address:this.address,
+							id:this.id,
+							is_default:this.checked ? 1 : 0,
+							is_user_add:1,
+							lat:this.latitude,
+							lng:this.longitude,
+							location_address:this.addresstext,
+							name:this.name,
+							phone:this.tel,
+						}
+					}).then(res => {
+						this.$u.toast(res.msg)
+						if(res.code == 0){
+							setTimeout(() => {
+								uni.navigateBack()
+							},800)
+						}else{
+							this.$tologin(res.msg)
+						}
+					})
+				}else{
+					this.$u.post('/UserAddress/add',{
+						content:{
+							address:this.address,
+							is_default:this.checked ? 1 : 0,
+							is_user_add:1,
+							lat:this.latitude,
+							lng:this.longitude,
+							location_address:this.addresstext,
+							name:this.name,
+							phone:this.tel,
+						}
+					}).then(res => {
+						this.$u.toast(res.msg)
+						if(res.code == 0){
+							setTimeout(() => {
+								uni.navigateBack()
+							},800)
+						}
+					})
+				}
+				
 			},
-			openmap(){
-				uni.chooseLocation({
-					success: (res) => {
-						this.address = res.address
-						this.addresstext = res.name
-						this.latitude = res.latitude
-						this.longitude = res.longitude
-						console.log(res);
-					}
-				})
+			openmap(){
+				uni.chooseLocation({
+					success: (res) => {
+						this.address = res.address
+						this.addresstext = res.name
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						console.log(res);
+					}
+				})
 			}
 		}
 	}
@@ -157,7 +157,7 @@
 				font-size: 33rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -185,9 +185,9 @@
 				input {
 					flex: 1;
 					margin-left: 10rpx;
-					color: #09AA8C;
+					color: #00a3a0;
 				}
 			}
 		}
 	}
-</style>
+</style>

pages/mine/bangding.vue

@@ -12,16 +12,16 @@
 			</view>
 		</view>
 		<!-- <view class="xieyi u-flex u-col-center u-row-center">
-			<u-checkbox v-model="checked" active-color="#08AA8C;"></u-checkbox>
+			<u-checkbox v-model="checked" active-color="#00a3a0;"></u-checkbox>
 			<view>
 				<text @tap="checked = !checked">阅读并同意</text>
-				<text style="color: #08AA8C;">《登录/注册协议》</text>
+				<text style="color: #00a3a0;">《登录/注册协议》</text>
 			</view>
 		</view> -->
 		<view>
 			<x-button @click="bangding">绑定</x-button>
-		</view>
-		<u-verification-code :seconds="seconds" ref="uCode" @change="codeChange">
+		</view>
+		<u-verification-code :seconds="seconds" ref="uCode" @change="codeChange">
 		</u-verification-code>
 	</view>
 </template>
@@ -55,19 +55,19 @@
 							content: {
 								code: this.code,
 								headimgurl:user.userInfo.avatarUrl,
-								nickname:user.userInfo.nickName,
+								nickname:user.userInfo.nickName,
 								wechat_openid:uni.getStorageSync("openid"),
-								phone: this.phone,
+								phone: this.phone,
 								referral_code: uni.getStorageSync("yqm")
 							}
 						}).then(res => {
 							this.$u.toast(res.msg)
 							if (res.code == 0) {
-								uni.setStorageSync("token", res.response.token)
-								setTimeout(() => {
-									uni.switchTab({
-										url: "./mine"
-									})
+								uni.setStorageSync("token", res.response.token)
+								setTimeout(() => {
+									uni.switchTab({
+										url: "./mine"
+									})
 								}, 800)
 							}
 						})
@@ -131,4 +131,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/change-pwd.vue

@@ -35,8 +35,8 @@
 		</view>
 		<view class="tijiao">
 			<x-button @click="save">设置密码</x-button>
-		</view>
-		<u-verification-code :seconds="seconds" ref="uCode" @change="codeChange">
+		</view>
+		<u-verification-code :seconds="seconds" ref="uCode" @change="codeChange">
 		</u-verification-code>
 	</view>
 </template>
@@ -45,81 +45,81 @@
 	export default {
 		data() {
 			return {
-				userdata:{},
-				code:'',
-				pwd1:'',
-				pwd2:'',
-				pwd3:'',
-				pwd4:'',
-				pwd5:'',
-				tips: '获取验证码',
-				// refCode: null,
+				userdata:{},
+				code:'',
+				pwd1:'',
+				pwd2:'',
+				pwd3:'',
+				pwd4:'',
+				pwd5:'',
+				tips: '获取验证码',
+				// refCode: null,
 				seconds: 60,
 			}
 		},
 		onLoad() {
 			this.getuser()
 		},
-		methods: {
-			save(){
-				if(this.userdata.is_set_password == 0){
-					if(!this.code){
-						this.$u.toast("请输入验证码")
-						return
-					}
-					if(!this.pwd1){
-						this.$u.toast("请输入密码")
-						return
-					}
-					if(this.pwd1 != this.pwd2){
-						this.$u.toast("两次密码不一致")
-						return
-					}
-					this.$u.post('/UserPassword/accountPhoneCaptchaSetPassword',{
-						content:{
-							code:this.code,
-							password:this.$md5(this.pwd1)
-						}
-					}).then(res => {
-						this.$u.toast(res.msg)
-						if(res.code == 0){
-							setTimeout(() => {
-								uni.navigateBack()
-							},800)
-						}else{
-							this.$tologin(res.msg)
-						}
-					})
-				}
-				if(this.userdata.is_set_password == 1){
-					if(!this.pwd3){
-						this.$u.toast("请输入原密码")
-						return
-					}
-					if(!this.pwd4){
-						this.$u.toast("请输入新密码")
-						return
-					}
-					if(this.pwd4 != this.pwd5){
-						this.$u.toast("两次密码不一致")
-						return
-					}
-					this.$u.post('/UserPassword/updateOldPassword',{
-						content:{
-							old_password:this.$md5(this.pwd3),
-							password:this.$md5(this.pwd4)
-						}
-					}).then(res => {
-						this.$u.toast(res.msg)
-						if(res.code == 0){
-							setTimeout(() => {
-								uni.navigateBack()
-							},800)
-						}else{
-							this.$tologin(res.msg)
-						}
-					})
-				}
+		methods: {
+			save(){
+				if(this.userdata.is_set_password == 0){
+					if(!this.code){
+						this.$u.toast("请输入验证码")
+						return
+					}
+					if(!this.pwd1){
+						this.$u.toast("请输入密码")
+						return
+					}
+					if(this.pwd1 != this.pwd2){
+						this.$u.toast("两次密码不一致")
+						return
+					}
+					this.$u.post('/UserPassword/accountPhoneCaptchaSetPassword',{
+						content:{
+							code:this.code,
+							password:this.$md5(this.pwd1)
+						}
+					}).then(res => {
+						this.$u.toast(res.msg)
+						if(res.code == 0){
+							setTimeout(() => {
+								uni.navigateBack()
+							},800)
+						}else{
+							this.$tologin(res.msg)
+						}
+					})
+				}
+				if(this.userdata.is_set_password == 1){
+					if(!this.pwd3){
+						this.$u.toast("请输入原密码")
+						return
+					}
+					if(!this.pwd4){
+						this.$u.toast("请输入新密码")
+						return
+					}
+					if(this.pwd4 != this.pwd5){
+						this.$u.toast("两次密码不一致")
+						return
+					}
+					this.$u.post('/UserPassword/updateOldPassword',{
+						content:{
+							old_password:this.$md5(this.pwd3),
+							password:this.$md5(this.pwd4)
+						}
+					}).then(res => {
+						this.$u.toast(res.msg)
+						if(res.code == 0){
+							setTimeout(() => {
+								uni.navigateBack()
+							},800)
+						}else{
+							this.$tologin(res.msg)
+						}
+					})
+				}
 			},
 			getuser() {
 				this.$u.post('/User/getDetail').then(res => {
@@ -131,30 +131,30 @@
 						this.userdata = {}
 					}
 				})
-			},
-			codeChange(text) {
-				this.tips = text;
-			},
-			getCode() {
-				if (this.$refs.uCode.canGetCode) {
-					// 模拟向后端请求验证码
-					this.$u.post('/Auth/smsMobileCaptcha', {
-						content: {
-							account_phone: this.userdata.phone,
-							captcha_type: 3,
-							phone: this.userdata.phone,
-						}
-					}).then(res => {
-						this.$u.toast(res.msg)
-						if (res.code == 0) {
-							this.$refs.uCode.start();
-						}else{
-							this.$tologin(res.msg)
-						}
-					})
-				} else {
-					this.$u.toast('倒计时结束后再发送');
-				}
+			},
+			codeChange(text) {
+				this.tips = text;
+			},
+			getCode() {
+				if (this.$refs.uCode.canGetCode) {
+					// 模拟向后端请求验证码
+					this.$u.post('/Auth/smsMobileCaptcha', {
+						content: {
+							account_phone: this.userdata.phone,
+							captcha_type: 3,
+							phone: this.userdata.phone,
+						}
+					}).then(res => {
+						this.$u.toast(res.msg)
+						if (res.code == 0) {
+							this.$refs.uCode.start();
+						}else{
+							this.$tologin(res.msg)
+						}
+					})
+				} else {
+					this.$u.toast('倒计时结束后再发送');
+				}
 			},
 		}
 	}
@@ -167,10 +167,10 @@
 			font-family: SimHei;
 			font-weight: 400;
 			padding: 42rpx 33rpx 21rpx 33rpx;
-			border-bottom: 4rpx solid #08AA8C;
+			border-bottom: 4rpx solid #00a3a0;
 
 			text:last-child {
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -208,4 +208,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/change-tel.vue

@@ -69,8 +69,8 @@
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 800)
-					}else{
-						this.$tologin(res.msg)
+					}else{
+						this.$tologin(res.msg)
 					}
 				})
 			},
@@ -90,8 +90,8 @@
 						this.$u.toast(res.msg)
 						if (res.code == 0) {
 							this.$refs.uCode.start();
-						}else{
-							this.$tologin(res.msg)
+						}else{
+							this.$tologin(res.msg)
 						}
 					})
 				} else {
@@ -109,10 +109,10 @@
 			font-family: SimHei;
 			font-weight: 400;
 			padding: 42rpx 33rpx 21rpx 33rpx;
-			border-bottom: 4rpx solid #08AA8C;
+			border-bottom: 4rpx solid #00a3a0;
 
 			text:last-child {
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -150,4 +150,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/forget-tel1.vue

@@ -86,8 +86,8 @@
 								delta: 3
 							})
 						}, 800)
-					}else{
-						this.$tologin(res.msg)
+					}else{
+						this.$tologin(res.msg)
 					}
 				})
 
@@ -108,8 +108,8 @@
 						this.$u.toast(res.msg)
 						if (res.code == 0) {
 							this.$refs.uCode.start();
-						}else{
-							this.$tologin(res.msg)
+						}else{
+							this.$tologin(res.msg)
 						}
 					})
 				} else {
@@ -134,7 +134,7 @@
 			border-bottom: 4rpx solid #57C5B0;
 
 			text:last-child {
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -171,4 +171,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/forget-wen.vue

@@ -73,7 +73,7 @@
 							}))
 						})
 					} else {
-						this.$u.toast("答案错误")
+						this.$u.toast("答案错误")
 						this.$tologin(res.msg)
 					}
 				})
@@ -135,7 +135,7 @@
 				font-size: 25rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -152,8 +152,8 @@
 				font-size: 28rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 	}
-</style>
+</style>

pages/mine/forget-wen1.vue

@@ -26,46 +26,46 @@
 			return {
 				phone: '',
 				answer: '',
-				safety_problem_key:'',
-				pwd:'',
+				safety_problem_key:'',
+				pwd:'',
 				pwd1:''
 			}
 		},
 		onLoad(option) {
-			var content = JSON.parse(decodeURIComponent(option.content))
-			this.phone = content.phone
-			this.answer = content.answer
-			this.safety_problem_key = content.safety_problem_key
+			var content = JSON.parse(decodeURIComponent(option.content))
+			this.phone = content.phone
+			this.answer = content.answer
+			this.safety_problem_key = content.safety_problem_key
 		},
 		methods: {
-			save(){
-				if(!this.pwd){
-					this.$u.toast("请输入密码")
-					return
-				}
-				if(this.pwd != this.pwd1){
-					this.$u.toast("两次密码不一致")
-					return
-				}
-				this.$u.post('/Auth/phoneSafetyProblemAnswerSetPassword',{
-					content:{
-						answer:this.answer,
-						password:this.$md5(this.pwd),
-						phone:this.phone,
-						safety_problem_key:this.safety_problem_key,
-					}
-				}).then(res => {
-					this.$u.toast(res.msg)
-					if(res.code == 0){
-						setTimeout(() => {
-							uni.navigateBack({
-								delta:4
-							})
-						},800)
-					}else{
-						this.$tologin(res.msg)
-					}
-				})
+			save(){
+				if(!this.pwd){
+					this.$u.toast("请输入密码")
+					return
+				}
+				if(this.pwd != this.pwd1){
+					this.$u.toast("两次密码不一致")
+					return
+				}
+				this.$u.post('/Auth/phoneSafetyProblemAnswerSetPassword',{
+					content:{
+						answer:this.answer,
+						password:this.$md5(this.pwd),
+						phone:this.phone,
+						safety_problem_key:this.safety_problem_key,
+					}
+				}).then(res => {
+					this.$u.toast(res.msg)
+					if(res.code == 0){
+						setTimeout(() => {
+							uni.navigateBack({
+								delta:4
+							})
+						},800)
+					}else{
+						this.$tologin(res.msg)
+					}
+				})
 			}
 		}
 	}
@@ -81,10 +81,10 @@
 			font-family: SimHei;
 			font-weight: 400;
 			padding: 42rpx 33rpx 21rpx 33rpx;
-			border-bottom: 4rpx solid #08AA8C;
+			border-bottom: 4rpx solid #00a3a0;
 
 			text:last-child {
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -121,4 +121,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/fuwu-info.vue

@@ -23,7 +23,7 @@
 					审核时间:{{facilitator_examine.last_audit_time}}
 				</view>
 			</view>
-			<view v-if="facilitator_examine.status === 1" style="color: #08AA8C;padding: 10rpx 0;">
+			<view v-if="facilitator_examine.status === 1" style="color: #00a3a0;padding: 10rpx 0;">
 				<view class="status-box">
 					审核结果:{{facilitator_examine.procedure_remark}}
 				</view>
@@ -57,12 +57,12 @@
 					</view>
 					<view class="input-box u-flex u-col-center">
 						<text class="text">性别:</text>
-						<u-radio-group v-model="value" active-color="#08AA8C" :disabled="isedit">
+						<u-radio-group v-model="value" active-color="#00a3a0" :disabled="isedit">
 							<u-radio :name="1">
-								<text style="color: #08AA8C;">男</text>
+								<text style="color: #00a3a0;">男</text>
 							</u-radio>
 							<u-radio :name="2">
-								<text style="color: #08AA8C;">女</text>
+								<text style="color: #00a3a0;">女</text>
 							</u-radio>
 						</u-radio-group>
 					</view>
@@ -251,11 +251,11 @@
 				if (this.imglist_code.length == 0) {
 					this.$u.toast("请上传保险合同图片")
 					return
-				}
-				// if (this.facilitator_examine.status == -1) {
-				// 	var type = 1
-				// } else {
-				// 	var type = 0
+				}
+				// if (this.facilitator_examine.status == -1) {
+				// 	var type = 1
+				// } else {
+				// 	var type = 0
 				// }
 				// console.log({
 				// 		desc: this.jianjie,
@@ -270,7 +270,7 @@
 				// 		insure_state_time: this.starttime,
 				// 		name: this.name,
 				// 		phone: this.tel,
-				// 		sex: this.value,
+				// 		sex: this.value,
 				// 		type:1
 				// 	});
 				// 	return
@@ -288,7 +288,7 @@
 						insure_state_time: this.starttime,
 						name: this.name,
 						phone: this.tel,
-						sex: this.value,
+						sex: this.value,
 						type:1
 					}
 				}).then(res => {
@@ -297,8 +297,8 @@
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 800)
-					}else{
-						this.$tologin(res.msg)
+					}else{
+						this.$tologin(res.msg)
 					}
 				})
 			},
@@ -391,7 +391,7 @@
 							this.imglist_code.push(val.code)
 						})
 					} else {
-						this.$u.toast(res.msg)
+						this.$u.toast(res.msg)
 						this.$tologin(res.msg)
 					}
 				})
@@ -419,18 +419,18 @@
 
 			.jineng-label {
 				.text {
-					background-color: #09AA8C;
+					background-color: #00a3a0;
 					color: #FFFFFF;
 				}
 
 				text {
 					padding: 15rpx 20rpx;
 					border-radius: 10rpx;
-					color: #09AA8C;
+					color: #00a3a0;
 					font-size: 25rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					border: 1rpx solid #09AA8C;
+					border: 1rpx solid #00a3a0;
 					margin-right: 10rpx;
 				}
 			}
@@ -454,7 +454,7 @@
 				font-size: 25rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -626,7 +626,7 @@
 					// height: 126rpx;
 					padding: 20rpx 14rpx;
 					border-radius: 20rpx;
-					border: 4rpx solid #09AA8C;
+					border: 4rpx solid #00a3a0;
 					// padding: 14rpx;
 
 					.content {
@@ -665,4 +665,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/kaitong-fuwu.vue

@@ -7,7 +7,7 @@
 			<view class="status-box" v-if="facilitator_examine.status === 0" style="color: #E7DC61;">
 				审核结果:审核中
 			</view>
-			<view class="status-box" v-if="facilitator_examine.status === 1" style="color: #08AA8C;">
+			<view class="status-box" v-if="facilitator_examine.status === 1" style="color: #00a3a0;">
 				审核结果:审核通过
 			</view> -->
 			<view v-if="facilitator_qualifications_examine.status === -1" style="color: red;">
@@ -32,7 +32,7 @@
 					审核时间:{{facilitator_qualifications_examine.last_audit_time}}
 				</view>
 			</view>
-			<view v-if="facilitator_qualifications_examine.status === 1" style="color: #08AA8C;">
+			<view v-if="facilitator_qualifications_examine.status === 1" style="color: #00a3a0;">
 				<view class="status-box">
 					审核结果:{{facilitator_qualifications_examine.procedure_remark}}
 				</view>
@@ -63,7 +63,7 @@
 		<view style="background-color: #fff;border-radius:20rpx;width: 707rpx;margin: 0 auto;">
 			<view class="title u-flex u-col-center u-row-between">
 				<text>身份资料</text>
-				<text style="color: #08AA8C;" @tap="toxiugai" v-if="facilitator_qualifications_examine.status != undefined">修改身份资料</text>
+				<text style="color: #00a3a0;" @tap="toxiugai" v-if="facilitator_qualifications_examine.status != undefined">修改身份资料</text>
 			</view>
 			<view class="user-box u-flex u-col-center">
 				<view class="user-left u-flex-col u-col-center">
@@ -82,12 +82,12 @@
 					</view>
 					<view class="input-box u-flex u-col-center">
 						<text class="text">性别:</text>
-						<u-radio-group v-model="value" active-color="#08AA8C" :disabled="isedit">
+						<u-radio-group v-model="value" active-color="#00a3a0" :disabled="isedit">
 							<u-radio :name="1">
-								<text style="color: #08AA8C;">男</text>
+								<text style="color: #00a3a0;">男</text>
 							</u-radio>
 							<u-radio :name="2">
-								<text style="color: #08AA8C;">女</text>
+								<text style="color: #00a3a0;">女</text>
 							</u-radio>
 						</u-radio-group>
 					</view>
@@ -155,35 +155,35 @@
 
 		<view class="baoxian-box" v-for="(item,index) in classify_qualifications" :key="index" :style="{marginBottom:(item.group_code == classify_qualifications[index + 1].group_code) ? '-20rpx' : '40rpx'}">
 			<view class="upload-image u-flex-col">
-				<view style="font-size: 28rpx;color: #5B3E30;padding: 10rpx 0;">{{item.title}}<text style="color: red;">{{item.is_require == 1 ? '(必填)' : '(选填)'}}</text></view>
+				<view style="font-size: 28rpx;color: #5B3E30;padding: 10rpx 0;">{{item.title}}<text style="color: red;">{{item.is_require == 1 ? '(必填)' : '(选填)'}}</text></view>
 				<!-- type==0上传图片 -->
 				<u-upload v-if="item.type == 0" :custom-btn="true" width="177rpx" height="177rpx" :action="url" :show-progress="true" :header="header" :formData="$getdata()" :file-list="item.imglist" :max-count="item.number" @on-success="uploadsuccess1"
 					@on-remove="delimg1" name="img" :index='index' @on-uploaded="uploadover" @on-choose-complete='uploadstart' :disabled="isedit1" :deletable="!isedit1">
 					<image class="upload" slot="addBtn" src="../../static/images/648.png" mode=""></image>
 				</u-upload>
-				<text class="text1" v-if="item.type == 0">{{item.desc}}</text>
+				<text class="text1" v-if="item.type == 0">{{item.desc}}</text>
 				<!-- type==1选择时间 -->
 				<view class="change-time u-flex u-col-center" v-if="item.type == 1">
 					<image src="../../static/images/1150.png" mode=""></image>
 					<text class="text1" @tap="opentime(index)">{{item.desc || '请选择时间'}}</text>
-				</view>
+				</view>
 				<!-- type==2多行输入框 -->
 				<view class="text1" style="font-size: 24rpx;color: #000;" v-if="item.type == 2">
 					<textarea type="text" style="border: 1rpx solid #ADADAD;border-radius: 20rpx;width: 100%;padding: 24rpx;box-sizing: border-box;" :placeholder="`请输入${item.title}`" v-model="item.desc"></textarea>
-				</view>
-				<!-- type==3时间范围 -->
-				<view class="text1" style="font-size: 24rpx;color: #000;" v-if="item.type == 3">
-					<view class="change-time u-flex u-col-center">
-						<image src="../../static/images/1150.png" mode=""></image>
-						<text class="text1" @tap="openstarttimepicker(index)">{{item.desc.split('~')[0] || '请选择时间'}}</text>
-						<text class="text2">至</text>
-						<image src="../../static/images/1150.png" mode=""></image>
-						<text class="text1" @tap="openendtimepicker(index)">{{item.desc.split('~')[1] || '请选择时间'}}</text>
-					</view>
-				</view>
-				<!-- type==4单行输入框 -->
-				<view class="text1" style="font-size: 24rpx;color: #000;" v-if="item.type == 4">
-					<input type="text" style="border-bottom: 1rpx solid #B6B6B6;" :placeholder="`请输入${item.title}`" v-model="item.desc">
+				</view>
+				<!-- type==3时间范围 -->
+				<view class="text1" style="font-size: 24rpx;color: #000;" v-if="item.type == 3">
+					<view class="change-time u-flex u-col-center">
+						<image src="../../static/images/1150.png" mode=""></image>
+						<text class="text1" @tap="openstarttimepicker(index)">{{item.desc.split('~')[0] || '请选择时间'}}</text>
+						<text class="text2">至</text>
+						<image src="../../static/images/1150.png" mode=""></image>
+						<text class="text1" @tap="openendtimepicker(index)">{{item.desc.split('~')[1] || '请选择时间'}}</text>
+					</view>
+				</view>
+				<!-- type==4单行输入框 -->
+				<view class="text1" style="font-size: 24rpx;color: #000;" v-if="item.type == 4">
+					<input type="text" style="border-bottom: 1rpx solid #B6B6B6;" :placeholder="`请输入${item.title}`" v-model="item.desc">
 				</view>
 			</view>
 		</view>
@@ -262,7 +262,7 @@
 				isedit1: false,
 				classify_qualifications: [],
 				showtime: false,
-				timeindex: 0,
+				timeindex: 0,
 				opentimeindex:''
 			}
 		},
@@ -270,40 +270,40 @@
 			this.id = option.id
 			this.getdata()
 		},
-		methods: {
-			changestart(e) {
-				if(this.opentimeindex == 'top1'){
-					this.starttime = `${e.year}-${e.month}-${e.day}`
-				}else{
-					var a = this.classify_qualifications[this.opentimeindex].desc
-					console.log(a);
-					a = a.split('~')
-					a[0] = `${e.year}-${e.month}-${e.day}`
-					this.classify_qualifications[this.opentimeindex].desc = a.join("~")
-				}
-			},
-			changeend(e) {
-				if(this.opentimeindex == 'top1'){
-					this.endtime = `${e.year}-${e.month}-${e.day}`
-				}else{
-					var a = this.classify_qualifications[this.opentimeindex].desc
-					a = a.split('~')
-					a[1] = `${e.year}-${e.month}-${e.day}`
-					this.classify_qualifications[this.opentimeindex].desc = a.join("~")
-				}
-			},
-			openstarttimepicker(str){
-				if (!this.isedit1) {
-					this.opentimeindex = str
-					this.showstart = true
-				}
-				
-			},
-			openendtimepicker(str){
-				if (!this.isedit1) {
-					this.opentimeindex = str
-					this.showend = true
-				}
+		methods: {
+			changestart(e) {
+				if(this.opentimeindex == 'top1'){
+					this.starttime = `${e.year}-${e.month}-${e.day}`
+				}else{
+					var a = this.classify_qualifications[this.opentimeindex].desc
+					console.log(a);
+					a = a.split('~')
+					a[0] = `${e.year}-${e.month}-${e.day}`
+					this.classify_qualifications[this.opentimeindex].desc = a.join("~")
+				}
+			},
+			changeend(e) {
+				if(this.opentimeindex == 'top1'){
+					this.endtime = `${e.year}-${e.month}-${e.day}`
+				}else{
+					var a = this.classify_qualifications[this.opentimeindex].desc
+					a = a.split('~')
+					a[1] = `${e.year}-${e.month}-${e.day}`
+					this.classify_qualifications[this.opentimeindex].desc = a.join("~")
+				}
+			},
+			openstarttimepicker(str){
+				if (!this.isedit1) {
+					this.opentimeindex = str
+					this.showstart = true
+				}
+				
+			},
+			openendtimepicker(str){
+				if (!this.isedit1) {
+					this.opentimeindex = str
+					this.showend = true
+				}
 			},
 			opentime(index) {
 				if (!this.isedit1) {
@@ -329,7 +329,7 @@
 				uni.hideLoading()
 			},
 			delimg1(e, lists, index) {
-				this.classify_qualifications[index].imgcode.splice(e, 1)
+				this.classify_qualifications[index].imgcode.splice(e, 1)
 				// console.log(this.classify_qualifications[index].imgcode);
 			},
 			uploadsuccess1(e, key, lists, index) {
@@ -409,20 +409,20 @@
 								this.$u.toast(`请输入${this.classify_qualifications[i].title}`)
 								return
 							}
-						}
-						if (this.classify_qualifications[i].is_require == 1 && this.classify_qualifications[i].type == 3) {
-							// console.log(this.classify_qualifications[i]);
-							if (!this.classify_qualifications[i].desc && this.classify_qualifications[i].desc.split('～').length < 2) {
-								this.$u.toast(`请选择${this.classify_qualifications[i].title}`)
-								return
-							}
-						}
-						if (this.classify_qualifications[i].is_require == 1 && this.classify_qualifications[i].type == 4) {
-							// console.log(this.classify_qualifications[i]);
-							if (!this.classify_qualifications[i].desc) {
-								this.$u.toast(`请输入${this.classify_qualifications[i].title}`)
-								return
-							}
+						}
+						if (this.classify_qualifications[i].is_require == 1 && this.classify_qualifications[i].type == 3) {
+							// console.log(this.classify_qualifications[i]);
+							if (!this.classify_qualifications[i].desc && this.classify_qualifications[i].desc.split('～').length < 2) {
+								this.$u.toast(`请选择${this.classify_qualifications[i].title}`)
+								return
+							}
+						}
+						if (this.classify_qualifications[i].is_require == 1 && this.classify_qualifications[i].type == 4) {
+							// console.log(this.classify_qualifications[i]);
+							if (!this.classify_qualifications[i].desc) {
+								this.$u.toast(`请输入${this.classify_qualifications[i].title}`)
+								return
+							}
 						}
 
 					}
@@ -443,7 +443,7 @@
 						image_code: val.imgcode,
 						text: val.type == 0 ? '' : val.desc
 					})
-				})
+				})
 				console.log(credentials_gather_code);
 				// console.log({
 				// 		desc: this.jianjie,
@@ -497,8 +497,8 @@
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 800)
-					}else{
-						this.$tologin(res.msg)
+					}else{
+						this.$tologin(res.msg)
 					}
 				})
 			},
@@ -588,7 +588,7 @@
 							}
 						})
 						this.classify_qualifications.push(JSON.parse(JSON.stringify(val)))
-					})
+					})
 					this.facilitator_qualifications_examine = res.response.facilitator_qualifications_examine
 					this.facilitator_examine = res.response.facilitator_examine
 
@@ -672,18 +672,18 @@
 
 			.jineng-label {
 				.text {
-					background-color: #09AA8C;
+					background-color: #00a3a0;
 					color: #FFFFFF;
 				}
 
 				text {
 					padding: 15rpx 20rpx;
 					border-radius: 10rpx;
-					color: #09AA8C;
+					color: #00a3a0;
 					font-size: 25rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					border: 1rpx solid #09AA8C;
+					border: 1rpx solid #00a3a0;
 					margin-right: 10rpx;
 				}
 			}
@@ -707,7 +707,7 @@
 				font-size: 25rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -804,13 +804,12 @@
 		}
 
 		.jianjie-box {
-
 			border: 1rpx solid #ADADAD;
 			border-radius: 20rpx;
 			padding: 20rpx;
 			margin: 20rpx auto;
 			box-sizing: border-box;
-			margin: 0 24rpx;
+			margin: 10rpx 24rpx;
 		}
 
 		.user-box {
@@ -825,6 +824,7 @@
 
 					.text {
 						margin-right: 10rpx;
+						width: 120rpx;
 					}
 				}
 			}
@@ -879,7 +879,7 @@
 					// height: 126rpx;
 					padding: 20rpx 14rpx;
 					border-radius: 20rpx;
-					border: 4rpx solid #09AA8C;
+					border: 4rpx solid #00a3a0;
 					// padding: 14rpx;
 
 					.content {
@@ -918,4 +918,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/login-code.vue

@@ -27,11 +27,11 @@
 			</view>
 		</view>
 		<view class="xieyi u-flex u-col-center u-row-center">
-			<u-checkbox v-model="checked" active-color="#08AA8C;"></u-checkbox>
+			<u-checkbox v-model="checked" active-color="#00a3a0;"></u-checkbox>
 			<view>
 				<text @tap="checked = !checked">阅读并同意</text>
-				<text style="color: #08AA8C;" @tap="toxieyi(15)">《用户协议》</text>
-				<text style="color: #08AA8C;" @tap="toxieyi(14)">《隐私政策》</text>
+				<text style="color: #00a3a0;" @tap="toxieyi(15)">《用户协议》</text>
+				<text style="color: #00a3a0;" @tap="toxieyi(14)">《隐私政策》</text>
 			</view>
 		</view>
 		<view class="u-flex u-col-center u-row-center" style="margin-top: 20rpx;" v-if="checked">
@@ -61,7 +61,7 @@
 				tips: '获取验证码',
 				// refCode: null,
 				seconds: 60,
-				code1: '',
+				code1: '',
 				yqm:''
 			}
 		},
@@ -74,17 +74,17 @@
 					}
 				})
 			}
-		},
-		onLoad(option) {
-			if(option.yqm){
-				this.yqm = option.yqm
-			}
 		},
-		methods: {
-			toxieyi(type){
-				uni.navigateTo({
-					url:"./all-tips?type=" + type
-				})
+		onLoad(option) {
+			if(option.yqm){
+				this.yqm = option.yqm
+			}
+		},
+		methods: {
+			toxieyi(type){
+				uni.navigateTo({
+					url:"./all-tips?type=" + type
+				})
 			},
 			opentips() {
 				this.$u.toast("请勾选登录/注册协议")
@@ -94,30 +94,30 @@
 					return
 				}
 				console.log(e);
-				this.$u.post('/Auth/thirdPartyLogin', {
-					content: {
-						encrypted_data: e.detail.encryptedData,
-						iv: e.detail.iv,
-						login_code: this.code1,
-						openid:uni.getStorageSync("openid"),
-						type: 2,
-					}
-				}).then(res => {
-					this.code1 = ''
-					if (res.response.status == 0) {
-						uni.navigateTo({
-							url: "./bangding?phone=" + res.response.phone
-						})
-					} else {
-						this.$u.toast(res.msg)
-						if(res.code == 0){
-							uni.setStorageSync("token", res.response.token)
-							setTimeout(() => {
-								uni.navigateBack()
-							}, 800)
-						}
-						
-					}
+				this.$u.post('/Auth/thirdPartyLogin', {
+					content: {
+						encrypted_data: e.detail.encryptedData,
+						iv: e.detail.iv,
+						login_code: this.code1,
+						openid:uni.getStorageSync("openid"),
+						type: 2,
+					}
+				}).then(res => {
+					this.code1 = ''
+					if (res.response.status == 0) {
+						uni.navigateTo({
+							url: "./bangding?phone=" + res.response.phone
+						})
+					} else {
+						this.$u.toast(res.msg)
+						if(res.code == 0){
+							uni.setStorageSync("token", res.response.token)
+							setTimeout(() => {
+								uni.navigateBack()
+							}, 800)
+						}
+						
+					}
 				})
 			},
 			tologin() {
@@ -135,24 +135,24 @@
 					return
 				}
 				if (!this.checked) {
-					uni.showModal({
-						content:"请阅读并同意用户协议和隐私协议",
-						confirmText:"同意",
-						cancelText:"不同意",
-						success: (on) => {
-							if(on.confirm){
-								this.checked =  true
-								this.login()
-							}
-						}
+					uni.showModal({
+						content:"请阅读并同意用户协议和隐私协议",
+						confirmText:"同意",
+						cancelText:"不同意",
+						success: (on) => {
+							if(on.confirm){
+								this.checked =  true
+								this.login()
+							}
+						}
 					})
 					return
 				}
 				this.$u.post('/Auth/phoneCaptchaLoginRegister', {
 					content: {
 						code: this.code,
-						phone: this.tel,
-						referral_code:this.yqm,
+						phone: this.tel,
+						referral_code:this.yqm,
 						wechat_openid:uni.getStorageSync("openid"),
 					}
 				}).then(res => {
@@ -204,7 +204,7 @@
 		.other-login {
 			margin-bottom: 30rpx;
 			padding: 0 24rpx;
-			color: #08AA8C;
+			color: #00a3a0;
 		}
 
 		.login-butt {
@@ -240,7 +240,7 @@
 					font-size: 38rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					color: #08AA8C;
+					color: #00a3a0;
 					position: relative;
 					z-index: 10;
 				}
@@ -264,7 +264,7 @@
 				input {
 					flex: 1;
 					padding: 10rpx 16rpx;
-					border-bottom: 4rpx solid #08AA8C;
+					border-bottom: 4rpx solid #00a3a0;
 				}
 
 				.text2 {
@@ -291,8 +291,8 @@
 				font-size: 81rpx;
 				font-family: AliHYAiHei;
 				font-weight: 900;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 	}
-</style>
+</style>

pages/mine/login-wx.vue

@@ -14,11 +14,11 @@
 			</button>
 		</view>
 		<view class="xieyi u-flex u-col-center u-row-center">
-			<u-checkbox v-model="checked" active-color="#08AA8C;"></u-checkbox>
+			<u-checkbox v-model="checked" active-color="#00a3a0;"></u-checkbox>
 			<view>
 				<text @tap="checked = !checked">阅读并同意</text>
-				<text style="color: #08AA8C;" @tap="toxieyi(15)">《用户协议》</text>
-				<text style="color: #08AA8C;" @tap="toxieyi(14)">《隐私政策》</text>
+				<text style="color: #00a3a0;" @tap="toxieyi(15)">《用户协议》</text>
+				<text style="color: #00a3a0;" @tap="toxieyi(14)">《隐私政策》</text>
 			</view>
 		</view>
 		<!-- <view class="u-flex u-col-center u-row-center" style="margin-top: 20rpx;" v-if="checked">
@@ -121,17 +121,17 @@
 						this.$u.toast(res.msg)
 						if (res.code == 0) {
 							uni.setStorageSync("token", res.response.token)
-							this.$Socket.connectSocket()
-							// this.$Socket.getMessage((res) => {
-							// 	if(JSON.parse(res.data).code = '0000'){
-							// 		this.$u.post('/User/setWebsocketId',{
-							// 			content:{
-							// 				websocket_id:JSON.parse(res.data).message
-							// 			}
-							// 		}).then(res => {})
-							// 	}
-								
-							// 	console.log(res.data);
+							this.$Socket.connectSocket()
+							// this.$Socket.getMessage((res) => {
+							// 	if(JSON.parse(res.data).code = '0000'){
+							// 		this.$u.post('/User/setWebsocketId',{
+							// 			content:{
+							// 				websocket_id:JSON.parse(res.data).message
+							// 			}
+							// 		}).then(res => {})
+							// 	}
+								
+							// 	console.log(res.data);
 							// })
 							setTimeout(() => {
 								if (getCurrentPages().length == 1) {
@@ -262,7 +262,7 @@
 					font-size: 38rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					color: #08AA8C;
+					color: #00a3a0;
 					position: relative;
 					z-index: 10;
 				}
@@ -280,4 +280,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/login.vue

@@ -26,24 +26,24 @@
 			</view>
 		</view>
 		<view class="xieyi u-flex u-col-center u-row-center">
-			<u-checkbox v-model="checked" active-color="#08AA8C;"></u-checkbox>
+			<u-checkbox v-model="checked" active-color="#00a3a0;"></u-checkbox>
 			<view>
 				<text @tap="checked = !checked">阅读并同意</text>
-				<text style="color: #08AA8C;" @tap="toxieyi(15)">《用户协议》</text>
-				<text style="color: #08AA8C;" @tap="toxieyi(14)">《隐私政策》</text>
+				<text style="color: #00a3a0;" @tap="toxieyi(15)">《用户协议》</text>
+				<text style="color: #00a3a0;" @tap="toxieyi(14)">《隐私政策》</text>
 			</view>
 		</view>
-		<view class="u-flex u-col-center u-row-center" style="margin-top: 20rpx;" v-if="checked">
-			<button type="default" style="border: none;background-color: rgba(0,0,0,0);" class="button"
-				open-type="getPhoneNumber" @getphonenumber="wxlogin">
-				<image src="../../static/images/wxpic.png" style="width: 100rpx;height: 100rpx;" mode=""></image>
-			</button>
-		</view>
-		<view class="u-flex u-col-center u-row-center" style="margin-top: 20rpx;" v-else>
-			<button type="default" style="border: none;background-color: rgba(0,0,0,0);" class="button"
-				@click="opentips">
-				<image src="../../static/images/wxpic.png" style="width: 100rpx;height: 100rpx;" mode=""></image>
-			</button>
+		<view class="u-flex u-col-center u-row-center" style="margin-top: 20rpx;" v-if="checked">
+			<button type="default" style="border: none;background-color: rgba(0,0,0,0);" class="button"
+				open-type="getPhoneNumber" @getphonenumber="wxlogin">
+				<image src="../../static/images/wxpic.png" style="width: 100rpx;height: 100rpx;" mode=""></image>
+			</button>
+		</view>
+		<view class="u-flex u-col-center u-row-center" style="margin-top: 20rpx;" v-else>
+			<button type="default" style="border: none;background-color: rgba(0,0,0,0);" class="button"
+				@click="opentips">
+				<image src="../../static/images/wxpic.png" style="width: 100rpx;height: 100rpx;" mode=""></image>
+			</button>
 		</view>
 	</view>
 </template>
@@ -55,76 +55,76 @@
 			return {
 				checked: false,
 				tel: '',
-				pwd: '',
-				code:'',
+				pwd: '',
+				code:'',
 				code1:''
 			}
 		},
 		onLoad() {
 			uni.login({
-				provider: "weixin",
-				success: (code) => {
-					console.log(code);
-					this.code = code.code
+				provider: "weixin",
+				success: (code) => {
+					console.log(code);
+					this.code = code.code
 				}
 			})
 		},
-		onShow() {
-			if (!this.code1) {
-				uni.login({
-					provider: "weixin",
-					success: (code) => {
-						this.code1 = code.code
-					}
-				})
-			}
+		onShow() {
+			if (!this.code1) {
+				uni.login({
+					provider: "weixin",
+					success: (code) => {
+						this.code1 = code.code
+					}
+				})
+			}
 		},
-		methods: {
-			toxieyi(type){
-				if(type == 1){
-					uni.navigateTo({
-						url:"./all-tips?type=0"
-					})
-				}else{
-					uni.navigateTo({
-						url:"./all-tips?type=14"
-					})
-				}
-				
-			},
-			opentips() {
-				this.$u.toast("请勾选协议")
+		methods: {
+			toxieyi(type){
+				if(type == 1){
+					uni.navigateTo({
+						url:"./all-tips?type=0"
+					})
+				}else{
+					uni.navigateTo({
+						url:"./all-tips?type=14"
+					})
+				}
+				
+			},
+			opentips() {
+				this.$u.toast("请勾选协议")
 			},
 			wxlogin(e) {
-				if (!e.detail.encryptedData) {
-					return
-				}
-				console.log(e);
-				this.$u.post('/Auth/thirdPartyLogin', {
-					content: {
-						encrypted_data: e.detail.encryptedData,
-						iv: e.detail.iv,
-						login_code: this.code1,
-						openid:uni.getStorageSync("openid"),
-						type: 2
-					}
-				}).then(res => {
-					this.code1 = ''
-					if (res.response.status == 0) {
-						uni.navigateTo({
-							url: "./bangding?phone=" + res.response.phone
-						})
-					} else {
-						this.$u.toast(res.msg)
-						if(res.code == 0){
-							uni.setStorageSync("token", res.response.token)
-							setTimeout(() => {
-								uni.navigateBack({
-									delta:2
-								})
-							}, 800)
-						}
-					}
+				if (!e.detail.encryptedData) {
+					return
+				}
+				console.log(e);
+				this.$u.post('/Auth/thirdPartyLogin', {
+					content: {
+						encrypted_data: e.detail.encryptedData,
+						iv: e.detail.iv,
+						login_code: this.code1,
+						openid:uni.getStorageSync("openid"),
+						type: 2
+					}
+				}).then(res => {
+					this.code1 = ''
+					if (res.response.status == 0) {
+						uni.navigateTo({
+							url: "./bangding?phone=" + res.response.phone
+						})
+					} else {
+						this.$u.toast(res.msg)
+						if(res.code == 0){
+							uni.setStorageSync("token", res.response.token)
+							setTimeout(() => {
+								uni.navigateBack({
+									delta:2
+								})
+							}, 800)
+						}
+					}
 				})
 			},
 			login() {
@@ -137,16 +137,16 @@
 					return
 				}
 				if (!this.checked) {
-					uni.showModal({
-						content:"请阅读并同意用户协议和隐私协议",
-						confirmText:"同意",
-						cancelText:"不同意",
-						success: (on) => {
-							if(on.confirm){
-								this.checked =  true
-								this.login()
-							}
-						}
+					uni.showModal({
+						content:"请阅读并同意用户协议和隐私协议",
+						confirmText:"同意",
+						cancelText:"不同意",
+						success: (on) => {
+							if(on.confirm){
+								this.checked =  true
+								this.login()
+							}
+						}
 					})
 					return
 				}
@@ -160,8 +160,8 @@
 					uni.setStorageSync("token", res.response.token)
 					if (res.code == 0) {
 						setTimeout(() => {
-							uni.navigateBack({
-								delta:2
+							uni.navigateBack({
+								delta:2
 							})
 						}, 800)
 					}
@@ -180,9 +180,9 @@
 </script>
 
 <style lang="scss">
-	.login {
-		.button:after {
-			border: none;
+	.login {
+		.button:after {
+			border: none;
 		}
 		.xieyi {
 			margin-top: 28rpx;
@@ -191,7 +191,7 @@
 		.other-login {
 			margin-bottom: 30rpx;
 			padding: 0 24rpx;
-			color: #08AA8C;
+			color: #00a3a0;
 		}
 
 		.login-butt {
@@ -227,7 +227,7 @@
 					font-size: 38rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					color: #08AA8C;
+					color: #00a3a0;
 					position: relative;
 					z-index: 10;
 				}
@@ -251,7 +251,7 @@
 				input {
 					flex: 1;
 					padding: 10rpx 16rpx;
-					border-bottom: 4rpx solid #08AA8C;
+					border-bottom: 4rpx solid #00a3a0;
 				}
 
 				.text2 {
@@ -278,8 +278,8 @@
 				font-size: 81rpx;
 				font-family: AliHYAiHei;
 				font-weight: 900;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 	}
-</style>
+</style>

pages/mine/mine.vue

@@ -13,7 +13,7 @@
 			<image @tap="toyaoqing" src="../../static/images/mine1-2.png" class="code" mode=""></image>
 		</view>
 		<view style="padding: 0 26rpx;">
-			<u-gap height="7" bg-color="#08AA8C"></u-gap>
+			<u-gap height="7" bg-color="#00a3a0"></u-gap>
 		</view>
 		<!-- <view class="price-box u-flex u-col-center u-row-between">
 			<text class="text1">我的钱包:</text>
@@ -30,7 +30,7 @@
 			</view>
 			<view class="row-box2 u-flex u-col-center">
 				<text class="text1">在线接单状态</text>
-				<u-switch v-model="checked" size="40" active-color="#08AA8C" @change="changeswitch"></u-switch>
+				<u-switch v-model="checked" size="40" active-color="#00a3a0" @change="changeswitch"></u-switch>
 			</view>
 			<view class="row-box3 u-flex u-col-center">
 				<text class="text1">在线接单时间：{{jiedantime || '暂未设置'}}</text>
@@ -73,7 +73,7 @@
 					<view class="item u-flex-col u-col-center" v-for="(item,index) in fuwulist" :key="index" @tap="toinfo(item)">
 						<view class="image u-flex u-col-center u-row-center">
 							<image :src="item.classify_image" mode=""></image>
-							<text class="text2" v-if="fuwutype == 1" style="color: #2AA47F;">通过</text>
+							<text class="text2" v-if="fuwutype == 1" style="color: #00a3a0;">通过</text>
 							<text class="text2" v-if="fuwutype == 0">审核中</text>
 						</view>
 						<view class="name">
@@ -159,7 +159,7 @@
 				})
 			} else {
 				this.userdata = {}
-				this.$refs.nav.count = 0
+				this.$refs.nav.count = 0
 				this.$refs.tabbar.setbadge(0)
 				uni.removeTabBarBadge({
 					index: 1,
@@ -406,14 +406,14 @@
 					.name {
 						font-size: 29rpx;
 						font-family: SimHei;
-						color: #08AA8C;
+						color: #00a3a0;
 					}
 
 					.image {
 						width: 124rpx;
 						height: 124rpx;
 						border-radius: 20rpx;
-						// background-color: #08AA8C;
+						// background-color: #00a3a0;
 						position: relative;
 						margin-bottom: 10rpx;
 
@@ -454,8 +454,8 @@
 				}
 
 				.text {
-					color: #08AA8C;
-					border-bottom: 7rpx solid #08AA8C;
+					color: #00a3a0;
+					border-bottom: 7rpx solid #00a3a0;
 				}
 			}
 
@@ -581,7 +581,7 @@
 			}
 
 			.name1 {
-				color: #2AA47F;
+				color: #00a3a0;
 				text-align: left;
 				flex: 1;
 				margin: 0 28rpx;
@@ -600,4 +600,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/more-fuwu.vue

@@ -1,84 +1,84 @@
-<template>
-	<view class="more-fuwu">
-		<view class="list-box">
-			<view class="item-box u-flex u-col-center u-row-between" v-for="(item,index) in list" :key="index" @tap="tokaitong(item)">
-				<image :src="item.image" mode=""></image>
-				<view class="item-right">
-					<view class="top u-flex u-col-center u-row-between">
-						<text>{{item.title}}</text>
-						<text v-if="item.qualifications_status == null" style="color: #999;">未申请</text>
-						<text v-if="item.qualifications_status === -1" style="color: red;">不通过</text>
-						<text v-if="item.qualifications_status === 0" style="color: #E7DC61;">审核中</text>
-						<text v-if="item.qualifications_status === 1">已通过</text>
-					</view>
-					<view class="content">
-						   {{item.desc}}
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data(){
-			return{
-				list:[]
-			}
-		},
-		onShow() {
-			this.getdata()
-		},
-		methods:{
-			async getdata(){
-				var res = await this.$u.post('/FacilitatorExamine/allClassify')
-				this.list = res.response.data
-			},
-			tokaitong(item){
-				uni.navigateTo({
-					url:"./kaitong-fuwu?id=" + item.id
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.more-fuwu{
-		padding: 24rpx;
-		.list-box{
-			.item-box{
-				margin-bottom: 20rpx;
-				image{
-					width: 126rpx;
-					height: 126rpx;
-					margin-right: 33rpx;
-				}
-				.item-right{
-					flex: 1;
-					// height: 126rpx;
-					border-radius: 20rpx;
-					border: 4rpx solid #09AA8C;
-					padding: 14rpx;
-					.content{
-						font-size: 25rpx;
-						font-family: SimHei;
-						font-weight: 400;
-						color: rgba(112, 112, 112, 1);
-					}
-					.top{
-						margin-bottom: 10rpx;
-						font-size: 25rpx;
-						font-family: SimHei;
-						font-weight: 400;
-						text:last-child{
-							color: rgba(8, 170, 140, 1);
-						}
-					}
-				}
-			}
-			
-		}
-	}
-</style>
+<template>
+	<view class="more-fuwu">
+		<view class="list-box">
+			<view class="item-box u-flex u-col-center u-row-between" v-for="(item,index) in list" :key="index" @tap="tokaitong(item)">
+				<image :src="item.image" mode=""></image>
+				<view class="item-right">
+					<view class="top u-flex u-col-center u-row-between">
+						<text>{{item.title}}</text>
+						<text v-if="item.qualifications_status == null" style="color: #999;">未申请</text>
+						<text v-if="item.qualifications_status === -1" style="color: red;">不通过</text>
+						<text v-if="item.qualifications_status === 0" style="color: #E7DC61;">审核中</text>
+						<text v-if="item.qualifications_status === 1">已通过</text>
+					</view>
+					<view class="content">
+						   {{item.desc}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				list:[]
+			}
+		},
+		onShow() {
+			this.getdata()
+		},
+		methods:{
+			async getdata(){
+				var res = await this.$u.post('/FacilitatorExamine/allClassify')
+				this.list = res.response.data
+			},
+			tokaitong(item){
+				uni.navigateTo({
+					url:"./kaitong-fuwu?id=" + item.id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.more-fuwu{
+		padding: 24rpx;
+		.list-box{
+			.item-box{
+				margin-bottom: 20rpx;
+				image{
+					width: 126rpx;
+					height: 126rpx;
+					margin-right: 33rpx;
+				}
+				.item-right{
+					flex: 1;
+					// height: 126rpx;
+					border-radius: 20rpx;
+					border: 4rpx solid #00a3a0;
+					padding: 14rpx;
+					.content{
+						font-size: 25rpx;
+						font-family: SimHei;
+						font-weight: 400;
+						color: rgba(112, 112, 112, 1);
+					}
+					.top{
+						margin-bottom: 10rpx;
+						font-size: 25rpx;
+						font-family: SimHei;
+						font-weight: 400;
+						text:last-child{
+							color: rgba(8, 170, 140, 1);
+						}
+					}
+				}
+			}
+			
+		}
+	}
+</style>

pages/mine/setting.vue

@@ -4,18 +4,24 @@
 			<!-- <view class="row-box u-flex u-col-center u-row-between" @tap="totel">
 				<text class="text1">手机号</text>
 				<text class="text2">设置</text>
-				<u-icon name="arrow-right" color="#08AA8C"></u-icon>
+				<u-icon name="arrow-right" color="#00a3a0"></u-icon>
 			</view> -->
+			<view class="row-box u-flex u-col-center u-row-between">
+				<text class="text1">版本号</text>
+				<text class="text2">{{version}}</text>
+				<u-icon name="arrow-right" color="#00a3a0"></u-icon>
+			</view>
 			<view class="row-box u-flex u-col-center u-row-between" @tap="topwd">
 				<text class="text1">密码设置</text>
 				<text class="text2">{{userdata.is_set_password == 1 ? '修改密码' : '未设置'}}</text>
-				<u-icon name="arrow-right" color="#08AA8C"></u-icon>
+				<u-icon name="arrow-right" color="#00a3a0"></u-icon>
 			</view>
 			<view class="row-box u-flex u-col-center u-row-between" @tap="toanquan">
 				<text class="text1">帐号安全</text>
 				<text class="text2">设置</text>
-				<u-icon name="arrow-right" color="#08AA8C"></u-icon>
+				<u-icon name="arrow-right" color="#00a3a0"></u-icon>
 			</view>
+			
 		</view>
 		<view class="button-down">
 			<x-button @click="toout">退出登录</x-button>
@@ -27,15 +33,23 @@
 	export default {
 		data() {
 			return {
-				userdata: {}
+				userdata: {},
+				version:'体验版'
 			}
 		},
 		onShow() {
 			if (uni.getStorageSync("token")) {
 				this.getuser()
+				this.getversion()
 			}
 		},
 		methods: {
+			getversion(){
+				const accountInfo = wx.getAccountInfoSync();
+				if(accountInfo.miniProgram.envVersion=='release'){
+				    this.version = accountInfo.miniProgram.version;
+				}
+			},
 			getuser() {
 				this.$u.post('/User/getDetail').then(res => {
 					if (res.code == 0) {
@@ -51,7 +65,7 @@
 				uni.showModal({
 					content: "确认退出登录？",
 					success: (res) => {
-						if (res.confirm) {
+						if (res.confirm) {
 							this.$Socket.closeSocket()
 							uni.removeStorageSync("token")
 							this.$u.toast("退出成功")
@@ -95,7 +109,7 @@
 					font-size: 33rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					color: #08AA8C;
+					color: #00a3a0;
 				}
 
 				.text2 {
@@ -105,10 +119,10 @@
 					font-size: 33rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					color: #08AA8C;
+					color: #00a3a0;
 
 				}
 			}
 		}
 	}
-</style>
+</style>

pages/mine/tel-add.vue

@@ -21,8 +21,8 @@
 		</view>
 		<view class="tijiao">
 			<x-button @click="save">确认设置</x-button>
-		</view>
-		<u-verification-code :seconds="seconds" ref="uCode" @change="codeChange">
+		</view>
+		<u-verification-code :seconds="seconds" ref="uCode" @change="codeChange">
 		</u-verification-code>
 	</view>
 </template>
@@ -31,14 +31,14 @@
 	export default {
 		data() {
 			return {
-				userdata: {
-					phone:''
+				userdata: {
+					phone:''
 				},
 				tel: '',
 				code: '',
-				pwd: '',
-				tips: '获取验证码',
-				// refCode: null,
+				pwd: '',
+				tips: '获取验证码',
+				// refCode: null,
 				seconds: 60,
 			}
 		},
@@ -71,8 +71,8 @@
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 800)
-					}else{
-						this.$tologin(res.msg)
+					}else{
+						this.$tologin(res.msg)
 					}
 				})
 			},
@@ -86,30 +86,30 @@
 						this.userdata = {}
 					}
 				})
-			},
-			codeChange(text) {
-				this.tips = text;
-			},
-			getCode() {
-				if (this.$refs.uCode.canGetCode) {
-					// 模拟向后端请求验证码
-					this.$u.post('/Auth/smsMobileCaptcha', {
-						content: {
-							account_phone: this.tel,
-							captcha_type: 2,
-							phone: this.tel,
-						}
-					}).then(res => {
-						this.$u.toast(res.msg)
-						if (res.code == 0) {
-							this.$refs.uCode.start();
-						}else{
-							this.$tologin(res.msg)
-						}
-					})
-				} else {
-					this.$u.toast('倒计时结束后再发送');
-				}
+			},
+			codeChange(text) {
+				this.tips = text;
+			},
+			getCode() {
+				if (this.$refs.uCode.canGetCode) {
+					// 模拟向后端请求验证码
+					this.$u.post('/Auth/smsMobileCaptcha', {
+						content: {
+							account_phone: this.tel,
+							captcha_type: 2,
+							phone: this.tel,
+						}
+					}).then(res => {
+						this.$u.toast(res.msg)
+						if (res.code == 0) {
+							this.$refs.uCode.start();
+						}else{
+							this.$tologin(res.msg)
+						}
+					})
+				} else {
+					this.$u.toast('倒计时结束后再发送');
+				}
 			},
 		}
 	}
@@ -122,10 +122,10 @@
 			font-family: SimHei;
 			font-weight: 400;
 			padding: 42rpx 33rpx 21rpx 33rpx;
-			border-bottom: 4rpx solid #08AA8C;
+			border-bottom: 4rpx solid #00a3a0;
 
 			text:last-child {
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -163,4 +163,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/tel-list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="tel-list">
 		<view class="header u-flex u-col-center u-row-right" @tap="totips">
-			<u-icon name="info-circle" size="33" color="#08AA8C"></u-icon>
+			<u-icon name="info-circle" size="33" color="#00a3a0"></u-icon>
 			<text class="text">最多不能超过三个</text>
 		</view>
 		<view class="item" v-for="(item,index) in list" :key="index">
@@ -135,7 +135,7 @@
 			line-height: 80rpx;
 			border-radius: 10rpx;
 			color: #fff;
-			background-color: #08AA8C;
+			background-color: #00a3a0;
 			text-align: center;
 		}
 
@@ -149,7 +149,7 @@
 				font-size: 33rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 				padding: 0 0 20rpx 0;
 			}
 
@@ -171,8 +171,8 @@
 				font-size: 33rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 	}
-</style>
+</style>

pages/mine/userinfo.vue

@@ -7,26 +7,26 @@
 			<view class="input-box u-flex u-col-bottom u-row-between">
 				<text class="text">昵称：</text>
 				<input type="text" v-model="nickname" placeholder="请输入昵称"/>
-				<image v-if="head" :src="head" @click="changeimg" class="image" mode=""></image>
+				<image v-if="head" :src="head" @click="changeimg" class="image" mode=""></image>
 				<image v-else @click="changeimg" src="../../static/images/head-img.jpg" class="image" mode=""></image>
 			</view>
 			<view class="input-box u-flex u-col-bottom u-row-between" style="width: 300rpx;">
 				<text class="text">性别：</text>
-				<u-radio-group v-model="value" active-color="#08AA8C">
+				<u-radio-group v-model="value" active-color="#00a3a0">
 					<u-radio :name="1">
-						<text style="color: #08AA8C;">男</text>
+						<text style="color: #00a3a0;">男</text>
 					</u-radio>
 					<u-radio :name="2">
-						<text style="color: #08AA8C;">女</text>
+						<text style="color: #00a3a0;">女</text>
 					</u-radio>
 				</u-radio-group>
-			</view>
-			<view class="tel-box u-flex u-col-center u-row-right">
-				<text style="margin-right: 20rpx;">手机号：{{tel.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')}}</text>
-				<text style="color: #08AA8C;" @tap="tochange">更换绑定</text>
-			</view>
-			<view class="tijiao">
-				<x-button @click="save">确认修改</x-button>
+			</view>
+			<view class="tel-box u-flex u-col-center u-row-right">
+				<text style="margin-right: 20rpx;">手机号：{{tel.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')}}</text>
+				<text style="color: #00a3a0;" @tap="tochange">更换绑定</text>
+			</view>
+			<view class="tijiao">
+				<x-button @click="save">确认修改</x-button>
 			</view>
 		</view>
 	</view>
@@ -36,88 +36,88 @@
 	export default {
 		data() {
 			return {
-				value: '',
-				nickname:'',
-				tel:'',
-				userdata:{},
-				yqm:'',
+				value: '',
+				nickname:'',
+				tel:'',
+				userdata:{},
+				yqm:'',
 				head:''
 			}
 		},
-		onShow() {
-			if(uni.getStorageSync("token")){
-				this.getuser()
+		onShow() {
+			if(uni.getStorageSync("token")){
+				this.getuser()
 			}
 		},
-		methods: {
-			save(){
-				if(!this.nickname){
-					this.$u.toast("请输入昵称")
-					return
-				}
-				this.$u.post('/User/updateDetail',{
-					content:{
-						age:'',
-						headimgurl_image_code:this.userdata.detail.headimgurl_image_code,
-						nickname:this.nickname,
-						sex:this.value
-					}
-				}).then(res => {
-					this.$u.toast(res.msg)
-					if(res.code ==  0){
-						this.getuser()
-					}else{
-						this.$tologin(res.msg)
-					}
-				})
-			},
-			changeimg(){
-				uni.chooseImage({
-					count:1,
-					success: (res) => {
-						var image = res.tempFilePaths[0]
-						uni.showLoading({
-							title:"上传中"
-						})
-						uni.uploadFile({
-							url:this.$url + '/User/updateHeadimgurl',
-							filePath:image,
-							name:'img[]',
-							formData:this.$getdata(),
-							header:{
-								token:uni.getStorageSync("token")
-							},
-							success:res => {
-								uni.hideLoading()
-								// console.log(JSON.parse(res.data));
-								this.$u.toast(JSON.parse(res.data).msg)
-								if(JSON.parse(res.data).code == 0){
-									this.head = image
-								}
-							}
-						})
-					}
-				})
-			},
-			getuser(){
-				this.$u.post('/User/getDetail').then(res => {
-					if(res.code == 0){
-						this.userdata = res.response
-						this.nickname = this.userdata.detail.nickname
-						this.value = this.userdata.detail.sex
-						this.tel = this.userdata.phone
-						this.yqm = this.userdata.detail.referral_code
-						this.head = this.userdata.detail.headimgurl_image_src
-					}else{
-						this.$u.toast(res.msg)
-						this.$tologin(res.msg)
-					}
-				})
+		methods: {
+			save(){
+				if(!this.nickname){
+					this.$u.toast("请输入昵称")
+					return
+				}
+				this.$u.post('/User/updateDetail',{
+					content:{
+						age:'',
+						headimgurl_image_code:this.userdata.detail.headimgurl_image_code,
+						nickname:this.nickname,
+						sex:this.value
+					}
+				}).then(res => {
+					this.$u.toast(res.msg)
+					if(res.code ==  0){
+						this.getuser()
+					}else{
+						this.$tologin(res.msg)
+					}
+				})
+			},
+			changeimg(){
+				uni.chooseImage({
+					count:1,
+					success: (res) => {
+						var image = res.tempFilePaths[0]
+						uni.showLoading({
+							title:"上传中"
+						})
+						uni.uploadFile({
+							url:this.$url + '/User/updateHeadimgurl',
+							filePath:image,
+							name:'img[]',
+							formData:this.$getdata(),
+							header:{
+								token:uni.getStorageSync("token")
+							},
+							success:res => {
+								uni.hideLoading()
+								// console.log(JSON.parse(res.data));
+								this.$u.toast(JSON.parse(res.data).msg)
+								if(JSON.parse(res.data).code == 0){
+									this.head = image
+								}
+							}
+						})
+					}
+				})
+			},
+			getuser(){
+				this.$u.post('/User/getDetail').then(res => {
+					if(res.code == 0){
+						this.userdata = res.response
+						this.nickname = this.userdata.detail.nickname
+						this.value = this.userdata.detail.sex
+						this.tel = this.userdata.phone
+						this.yqm = this.userdata.detail.referral_code
+						this.head = this.userdata.detail.headimgurl_image_src
+					}else{
+						this.$u.toast(res.msg)
+						this.$tologin(res.msg)
+					}
+				})
 			},
-			tochange(){
-				uni.navigateTo({
-					url:"./change-tel?tel=" + this.tel
-				})
+			tochange(){
+				uni.navigateTo({
+					url:"./change-tel?tel=" + this.tel
+				})
 			}
 		}
 	}
@@ -127,8 +127,8 @@
 	.userinfo {
 		.user-box {
 			padding: 42rpx 34rpx;
-			.tijiao {
-				margin: 200rpx auto;
+			.tijiao {
+				margin: 200rpx auto;
 			}
 			.input-box {
 				margin-bottom: 40rpx;
@@ -139,7 +139,7 @@
 					font-size: 33rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					color: #08AA8C;
+					color: #00a3a0;
 				}
 
 				input {
@@ -161,4 +161,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/wenda-add.vue

@@ -60,7 +60,7 @@
 				this.$u.post('/UserSafetyProblem/add', {
 					content: {
 						safety_problem_key: this.typeid,
-						answer: this.$md5(this.daan),
+						answer: this.$md5(this.daan),
 						password:this.$md5(this.pwd)
 					}
 				}).then(res => {
@@ -69,12 +69,12 @@
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 800)
-					}else{
-						this.$tologin(res.msg)
+					}else{
+						this.$tologin(res.msg)
 					}
 				})
 			},
-			changetype(e) {
+			changetype(e) {
 				this.typeid = this.typelist[e.detail.value].key
 				this.typetext = this.typelist[e.detail.value].problem
 			},
@@ -152,7 +152,7 @@
 				font-size: 25rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 
@@ -165,8 +165,8 @@
 			border-bottom: 4rpx solid #57C5B0;
 
 			text:last-child {
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 	}
-</style>
+</style>

pages/mine/wenda-list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="wenda-list">
 		<view class="header u-flex u-col-center u-row-right">
-			<u-icon name="info-circle" size="33" color="#08AA8C"></u-icon>
+			<u-icon name="info-circle" size="33" color="#00a3a0"></u-icon>
 			<text class="text">最多不能超过三个</text>
 		</view>
 		<view class="item" v-for="(item,index) in list" :key="index">
@@ -134,7 +134,7 @@
 			line-height: 80rpx;
 			border-radius: 10rpx;
 			color: #fff;
-			background-color: #08AA8C;
+			background-color: #00a3a0;
 			text-align: center;
 		}
 
@@ -148,7 +148,7 @@
 				font-size: 33rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 				padding: 0 0 20rpx 0;
 			}
 
@@ -170,8 +170,8 @@
 				font-size: 33rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 	}
-</style>
+</style>

pages/mine/xiaoxi-info.vue

@@ -1,63 +1,63 @@
-<template>
-	<view class="xiaoxi-info" v-if="datainfo.msg_text">
-		<view class="xiaoxi-msg">
-			{{datainfo.msg_text}}
-		</view>
-		<view class="xiaoxi-title">
-			{{datainfo.title}}
-		</view>
-		<view class="xiaoxi-right">
-			{{datainfo.create_time}}
-		</view>
-		<view class="xiaoxi-text">
-			{{datainfo.content}}
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data(){
-			return{
-				id:'',
-				datainfo:{}
-			}
-		},
-		onLoad(option) {
-			this.id = option.id
-			this.getdata()
-		},
-		methods:{
-			getdata(){
-				this.$u.post('/UserMessage/get',{
-					content:{
-						id:this.id
-					}
-				}).then(res => {
-					this.datainfo = res.response
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.xiaoxi-info{
-		padding: 20rpx;
-		.xiaoxi-right{
-			font-size: 30rpx;
-			text-align: right;
-			margin-bottom: 30rpx;
-		}
-		.xiaoxi-title{
-			font-size: 32rpx;
-			color: #2AA47F;
-			margin-bottom: 10rpx;
-		}
-		.xiaoxi-msg{
-			font-size: 28rpx;
-			color: #2AA47F;
-			margin-bottom: 10rpx;
-		}
-	}
-</style>
+<template>
+	<view class="xiaoxi-info" v-if="datainfo.msg_text">
+		<view class="xiaoxi-msg">
+			{{datainfo.msg_text}}
+		</view>
+		<view class="xiaoxi-title">
+			{{datainfo.title}}
+		</view>
+		<view class="xiaoxi-right">
+			{{datainfo.create_time}}
+		</view>
+		<view class="xiaoxi-text">
+			{{datainfo.content}}
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				id:'',
+				datainfo:{}
+			}
+		},
+		onLoad(option) {
+			this.id = option.id
+			this.getdata()
+		},
+		methods:{
+			getdata(){
+				this.$u.post('/UserMessage/get',{
+					content:{
+						id:this.id
+					}
+				}).then(res => {
+					this.datainfo = res.response
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.xiaoxi-info{
+		padding: 20rpx;
+		.xiaoxi-right{
+			font-size: 30rpx;
+			text-align: right;
+			margin-bottom: 30rpx;
+		}
+		.xiaoxi-title{
+			font-size: 32rpx;
+			color: #00a3a0;
+			margin-bottom: 10rpx;
+		}
+		.xiaoxi-msg{
+			font-size: 28rpx;
+			color: #00a3a0;
+			margin-bottom: 10rpx;
+		}
+	}
+</style>

pages/mine/xiaoxi.vue

@@ -7,8 +7,8 @@
 		<view class="item" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
 			<view class="top u-flex u-col-center u-row-between">
 				<text>{{item.create_time}}</text>
-				<text v-if="item.is_read == 1" style="color: #FDCE1C;">已读信息</text>
-				<text v-if="item.is_read == 0" style="color: #08AA8C;">未读信息</text>
+				<text v-if="item.is_read == 1" style="color: #fff;">已读信息</text>
+				<text v-if="item.is_read == 0" style="color: #00a3a0;">未读信息</text>
 			</view>
 			<view class="item-content u-flex-col">
 				<text>{{item.title}}</text>
@@ -110,7 +110,7 @@
 						} else {
 							this.list = this.list.concat(res.response.data)
 						}
-					} else {
+					} else {
 						this.$u.toast(res.msg)
 						this.$tologin(res.msg)
 					}
@@ -154,7 +154,7 @@
 				font-size: 33rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 				padding: 10rpx 0 20rpx 0;
 			}
 		}
@@ -172,8 +172,8 @@
 				font-size: 33rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 			}
 		}
 	}
-</style>
+</style>

pages/order/fuwu-orderinfo.vue

@@ -220,7 +220,7 @@
 				<view style="padding: 20rpx 0;text-align: center;">
 					确认完成订单
 				</view>
-				<view style="width: 702rpx;text-align: right;color: #2AA47F;display: flex;align-items: center;justify-content:flex-end;">
+				<view style="width: 702rpx;text-align: right;color: #00a3a0;display: flex;align-items: center;justify-content:flex-end;">
 					当前位置：{{overaddress}}
 					<u-icon name="reload" color="#9A9A9A" size="40" @click="getaddress"></u-icon>
 				</view>
@@ -319,7 +319,7 @@
 									this.getorder()
 								}
 							} else {
-								this.$u.toast(res.msg)
+								this.$u.toast(res.msg)
 								this.$tologin(res.msg)
 							}
 						})
@@ -338,7 +338,7 @@
 					if (res.code == 0) {
 						this.getorder()
 					} else {
-						this.$u.toast(res.msg)
+						this.$u.toast(res.msg)
 						this.$tologin(res.msg)
 					}
 				})
@@ -352,7 +352,7 @@
 					if (res.code == 0) {
 						this.getorder()
 					} else {
-						this.$u.toast(res.msg)
+						this.$u.toast(res.msg)
 						this.$tologin(res.msg)
 					}
 				})
@@ -366,7 +366,7 @@
 					if (res.code == 0) {
 						this.getorder()
 					} else {
-						this.$u.toast(res.msg)
+						this.$u.toast(res.msg)
 						this.$tologin(res.msg)
 					}
 				})
@@ -380,7 +380,7 @@
 					if (res.code == 0) {
 						this.getorder()
 					} else {
-						this.$u.toast(res.msg)
+						this.$u.toast(res.msg)
 						this.$tologin(res.msg)
 					}
 				})
@@ -412,7 +412,7 @@
 
 
 					} else {
-						this.$u.toast(res.msg)
+						this.$u.toast(res.msg)
 						this.$tologin(res.msg)
 					}
 				})
@@ -434,7 +434,7 @@
 						lng: this.lng,
 						order_no: this.id
 					}
-				}).then(res => {
+				}).then(res => {
 					this.$tologin(res.msg)
 					this.type = res.response.source_type
 					this.orderdata = res.response
@@ -668,7 +668,7 @@
 				border-bottom: 1rpx solid #DCDADC;
 
 				// text:last-child {
-				// 	color: #2AA47F;
+				// 	color: #00a3a0;
 				// }
 			}
 
@@ -828,4 +828,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/order/order-info.vue

@@ -79,7 +79,7 @@
 				<view>
 					价格说明：{{orderdata.detail.price_desc}}
 				</view>
-				<view style="color: #2AA47F;" v-if="orderdata.detail.actual_location_address">送达位置：{{orderdata.detail.actual_location_address}}</view>
+				<view style="color: #00a3a0;" v-if="orderdata.detail.actual_location_address">送达位置：{{orderdata.detail.actual_location_address}}</view>
 			</view>
 		</view>
 		<view class="paotui-box" v-if="type == 2">
@@ -226,9 +226,13 @@
 				接单时间：{{orderdata.order_facilitator.create_time}}
 			</view>
 		</view>
-		<view class="fapiao u-flex-col">
-			<text>是否需要发票：{{orderdata.is_invoice == 1 ? '是' : '否'}}</text>
-			<text v-if="orderdata.is_invoice == 1">发票抬头：{{orderdata.invoice_title}}</text>
+		<view v-if="orderdata.source_type == 2 || orderdata.source_type == 1">
+			<view class="fapiao u-flex-col">
+				<text>是否需要发票：{{orderdata.is_invoice == 1 ? '是' : '否'}}</text>
+				<view v-if="orderdata.source_type == 2">
+					<text v-if="orderdata.is_invoice == 1">发票抬头：{{orderdata.invoice_title}}</text>
+				</view>
+			</view>
 		</view>
 		<view class="order-down u-flex-col">
 			<text v-if="type == 0">维修服务</text>
@@ -264,8 +268,8 @@
 			</view>
 			<view class="down-box u-flex u-col-center u-row-right" v-if="orderdata.order_status == -1 || orderdata.order_status == -2">
 				<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="tojindu()">服务进度</x-button>
-				<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu()">删除订单</x-button>
-				<x-button class="text2" v-if="orderdata.order_status == -1 && !orderdata.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi()">重新发起</x-button>
+				<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu()">删除订单</x-button>
+				<x-button class="text2" v-if="orderdata.order_status == -1 && !orderdata.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi()">重新发起</x-button>
 			</view>
 		</view>
 		<view v-if="type == 1">
@@ -289,8 +293,8 @@
 			</view>
 			<view class="down-box u-flex u-col-center u-row-right" v-if="orderdata.order_status == -1 || orderdata.order_status == -2">
 				<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="tojindu()">服务进度</x-button>
-				<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu()">删除订单</x-button>
-				<x-button class="text2" v-if="orderdata.order_status == -1 && !orderdata.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi()">重新发起</x-button>
+				<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu()">删除订单</x-button>
+				<x-button class="text2" v-if="orderdata.order_status == -1 && !orderdata.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi()">重新发起</x-button>
 				
 			</view>
 		</view>
@@ -315,8 +319,8 @@
 			</view>
 			<view class="down-box u-flex u-col-center u-row-right" v-if="orderdata.order_status == -1 || orderdata.order_status == -2">
 				<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="tojindu()">服务进度</x-button>
-				<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu()">删除订单</x-button>
-				<x-button class="text2" v-if="orderdata.order_status == -1 && !orderdata.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi()">重新发起</x-button>
+				<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu()">删除订单</x-button>
+				<x-button class="text2" v-if="orderdata.order_status == -1 && !orderdata.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi()">重新发起</x-button>
 				
 			</view>
 		</view>
@@ -344,7 +348,7 @@
 		</view>
 		<u-popup v-model="show" mode="bottom">
 			<view class="hexiaoma u-flex-col u-col-center">
-				<view style="color: #2AA47F;padding: 20rpx;">核销码</view>
+				<view style="color: #00a3a0;padding: 20rpx;">核销码</view>
 				<uqrcode style="margin-bottom: 40rpx;" ref="uQRCode" :text="hexiaourl" :size="160" />
 			</view>
 		</u-popup>
@@ -353,11 +357,11 @@
 				<text style="padding: 20rpx;">评价服务订单</text>
 				<view class="dianzan-box u-flex u-col-center u-row-center" style="padding: 20rpx 0;">
 					<view class="dianzan-item u-flex-col u-col-center" style="padding: 0 30rpx;" @tap="dianzan = true">
-						<u-icon name="thumb-up" size="46" :color="dianzan ? '#2AA47F' : '#999'"></u-icon>
+						<u-icon name="thumb-up" size="46" :color="dianzan ? '#00a3a0' : '#999'"></u-icon>
 						<text>点赞</text>
 					</view>
 					<view class="dianzan-item u-flex-col u-col-center u-row-center" style="padding: 0 30rpx;" @tap="dianzan = false">
-						<u-icon name="thumb-down" size="46" :color="!dianzan ? '#2AA47F' : '#999'"></u-icon>
+						<u-icon name="thumb-down" size="46" :color="!dianzan ? '#00a3a0' : '#999'"></u-icon>
 						<text>差评</text>
 					</view>
 				</view>
@@ -387,29 +391,29 @@
 				this.getdata()
 			}
 		},
-		methods: {
-			faqi(){
-				uni.showModal({
-					content: "确认重新发起？",
-					cancelText: "取消操作",
-					confirmText: "确认发起",
-					success: (on) => {
-						if (on.confirm) {
-							this.$u.post('/Order/reOrder',{
-								content: {
-									order_no: this.id,
-								}
-							}).then(res => {
-								this.$u.toast(res.msg)
-								if(res.code == 0){
-									setTimeout(() => {
-										this.getdata()
-									}, 800)
-								}
-							})
-						}
-					}
-				})
+		methods: {
+			faqi(){
+				uni.showModal({
+					content: "确认重新发起？",
+					cancelText: "取消操作",
+					confirmText: "确认发起",
+					success: (on) => {
+						if (on.confirm) {
+							this.$u.post('/Order/reOrder',{
+								content: {
+									order_no: this.id,
+								}
+							}).then(res => {
+								this.$u.toast(res.msg)
+								if(res.code == 0){
+									setTimeout(() => {
+										this.getdata()
+									}, 800)
+								}
+							})
+						}
+					}
+				})
 			},
 			openimage(index) {
 				var arr = []
@@ -434,8 +438,8 @@
 						setTimeout(() => {
 							this.getdata()
 						}, 800)
-					}else{
-						this.$tologin(res.msg)
+					}else{
+						this.$tologin(res.msg)
 					}
 				})
 			},
@@ -471,7 +475,7 @@
 							}
 						})
 					} else {
-						this.$u.toast(res.msg)
+						this.$u.toast(res.msg)
 						this.$tologin(res.msg)
 					}
 				})
@@ -487,7 +491,7 @@
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 800)
-					}
+					}
 					this.$tologin(res.msg)
 				})
 			},
@@ -502,7 +506,7 @@
 						setTimeout(() => {
 							this.getdata()
 						}, 800)
-					}
+					}
 					this.$tologin(res.msg)
 				})
 			},
@@ -513,7 +517,7 @@
 					}
 				}).then(res => {
 					this.type = res.response.source_type
-					this.orderdata = res.response
+					this.orderdata = res.response
 					this.$tologin(res.msg)
 					if (this.type == 0) {
 						uni.setNavigationBarTitle({
@@ -992,4 +996,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/order/order.vue

@@ -38,7 +38,7 @@
 						<!-- <text class="text1">1</text> -->
 					</view>
 				</view>
-				<view class="" @click="showfunction(1)" style="width: 750rpx;height: 60rpx;line-height: 60rpx;color: #fff;text-align: center;background-color: #2AA47F;" v-if="isshowshuaxin">
+				<view class="" @click="showfunction(1)" style="width: 750rpx;height: 60rpx;line-height: 60rpx;color: #fff;text-align: center;background-color: #00a3a0;" v-if="isshowshuaxin">
 					订单有更新，下拉或点击刷新
 				</view>
 			</view>
@@ -127,7 +127,7 @@
 						<view>
 							价格说明：{{item.detail.price_desc}}
 						</view>
-						<view style="color: #2AA47F;" v-if="item.detail.actual_location_address">送达位置：{{item.detail.actual_location_address}}</view>
+						<view style="color: #00a3a0;" v-if="item.detail.actual_location_address">送达位置：{{item.detail.actual_location_address}}</view>
 					</view>
 				</view>
 				<view class="paotui-box" v-if="item.source_type == 2">
@@ -248,8 +248,8 @@
 							<text>姓名：{{item.order_facilitator.facilitator.name}}</text>
 							<view class="u-flex u-col-center" @click.stop="$tophone(item.order_facilitator.facilitator.phone)">
 								<text>联系电话：</text>
-								<u-icon name="phone-fill" size="36" color="#2AA47F"></u-icon>
-								<text style="color: #2AA47F;">{{item.order_facilitator.facilitator.phone}}</text>
+								<u-icon name="phone-fill" size="36" color="#00a3a0"></u-icon>
+								<text style="color: #00a3a0;">{{item.order_facilitator.facilitator.phone}}</text>
 							</view>
 							<text>工号：{{item.order_facilitator.facilitator.facilitator_uid}}</text>
 						</view>
@@ -336,8 +336,8 @@
 					</view>
 					<view class="u-flex u-col-center u-row-right" v-if="item.order_status == -1 || item.order_status == -2">
 						<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="tojindu(item)">服务进度</x-button>
-						<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu(item)">删除订单</x-button>
-						<x-button class="text2" v-if="item.order_status == -1 && !item.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi(item)">重新发起</x-button>
+						<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu(item)">删除订单</x-button>
+						<x-button class="text2" v-if="item.order_status == -1 && !item.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi(item)">重新发起</x-button>
 					</view>
 				</view>
 				<view class="butt-view" v-if="item.source_type == 2" @tap.stop>
@@ -361,8 +361,8 @@
 					</view>
 					<view class="u-flex u-col-center u-row-right" v-if="item.order_status == -1 || item.order_status == -2">
 						<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="tojindu(item)">服务进度</x-button>
-						<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu(item)">删除订单</x-button>
-						<x-button class="text2" v-if="item.order_status == -1 && !item.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi(item)">重新发起</x-button>
+						<x-button class="text2" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="shanchu(item)">删除订单</x-button>
+						<x-button class="text2" v-if="item.order_status == -1 && !item.order_facilitator" :width="160" :height="70" borderRadius="20rpx" fontSize="24rpx" @click="faqi(item)">重新发起</x-button>
 					</view>
 				</view>
 				<view class="butt-view" v-if="item.source_type == 3" @tap.stop>
@@ -610,7 +610,7 @@
 		<x-notdata v-if="list.length == 0" tips="数据为空,请重试" @shuaxin="showfunction(1)"></x-notdata>
 		<u-popup v-model="show" mode="bottom">
 			<view class="hexiaoma u-flex-col u-col-center">
-				<view style="color: #2AA47F;padding: 20rpx;">核销码</view>
+				<view style="color: #00a3a0;padding: 20rpx;">核销码</view>
 				<uqrcode style="margin-bottom: 40rpx;" ref="uQRCode" :text="hexiaourl" :size="160" />
 			</view>
 		</u-popup>
@@ -619,11 +619,11 @@
 				<text style="padding: 20rpx;">评价服务订单</text>
 				<view class="dianzan-box u-flex u-col-center u-row-center" style="padding: 20rpx 0;">
 					<view class="dianzan-item u-flex-col u-col-center" style="padding: 0 30rpx;" @tap="dianzan = true">
-						<u-icon name="thumb-up" size="46" :color="dianzan ? '#2AA47F' : '#999'"></u-icon>
+						<u-icon name="thumb-up" size="46" :color="dianzan ? '#00a3a0' : '#999'"></u-icon>
 						<text>点赞</text>
 					</view>
 					<view class="dianzan-item u-flex-col u-col-center u-row-center" style="padding: 0 30rpx;" @tap="dianzan = false">
-						<u-icon name="thumb-down" size="46" :color="!dianzan ? '#2AA47F' : '#999'"></u-icon>
+						<u-icon name="thumb-down" size="46" :color="!dianzan ? '#00a3a0' : '#999'"></u-icon>
 						<text>差评</text>
 					</view>
 				</view>
@@ -635,7 +635,7 @@
 				<view style="padding: 20rpx 0;text-align: center;">
 					确认完成订单
 				</view>
-				<view style="width: 702rpx;text-align: right;color: #2AA47F;margin-right: 20rpx;display: flex;align-items: center;justify-content:flex-end;">
+				<view style="width: 702rpx;text-align: right;color: #00a3a0;margin-right: 20rpx;display: flex;align-items: center;justify-content:flex-end;">
 					当前位置：{{overaddress}}
 					<u-icon name="reload" color="#9A9A9A" size="40" @click="getaddress"></u-icon>
 				</view>
@@ -656,7 +656,7 @@
 				<view style="width: 702rpx;padding: 0 20rpx;font-size: 20rpx;margin-bottom: 14rpx;color: #9A9A9A;">
 					(终点位置)
 				</view>
-				<view style="width:702rpx;color: #C6553C;font-size: 30rpx;text-align: right;">
+				<view style="width:702rpx;color: #ff0000;font-size: 30rpx;text-align: right;">
 					需付金额：{{daijiaover.payment_price_desc}}
 				</view>
 				<!-- <view style="width: 702rpx;font-size: 22rpx;text-align: right;">
@@ -745,19 +745,19 @@
 					confirmText: "确认发起",
 					success: (on) => {
 						if (on.confirm) {
-							this.$u.post('/Order/reOrder',{
-								content: {
-									order_no: item.order_no,
-								}
-							}).then(res => {
-								this.$u.toast(res.msg)
-								if(res.code == 0){
-									setTimeout(() => {
-										this.page = 1
-										this.getlist()
-										this.getordercount()
-									}, 800)
-								}
+							this.$u.post('/Order/reOrder',{
+								content: {
+									order_no: item.order_no,
+								}
+							}).then(res => {
+								this.$u.toast(res.msg)
+								if(res.code == 0){
+									setTimeout(() => {
+										this.page = 1
+										this.getlist()
+										this.getordercount()
+									}, 800)
+								}
 							})
 						}
 					}
@@ -893,7 +893,7 @@
 						order_no: item.order_no
 					}
 				}).then(res => {
-					if (res.code == 0) {
+					if (res.code == 0) {
 						this.page = 1
 						this.getlist()
 						this.getordercount()
@@ -909,7 +909,7 @@
 						order_no: item.order_no
 					}
 				}).then(res => {
-					if (res.code == 0) {
+					if (res.code == 0) {
 						this.page = 1
 						this.getlist()
 						this.getordercount()
@@ -925,7 +925,7 @@
 						order_no: item.order_no
 					}
 				}).then(res => {
-					if (res.code == 0) {
+					if (res.code == 0) {
 						this.page = 1
 						this.getlist()
 						this.getordercount()
@@ -1035,7 +1035,7 @@
 					if (res.code == 0) {
 						setTimeout(() => {
 							this.page = 1
-							this.getlist()
+							this.getlist()
 							this.getordercount()
 						}, 800)
 					}
@@ -1394,7 +1394,7 @@
 						}
 
 						text:nth-child(3) {
-							color: #2AA47F;
+							color: #00a3a0;
 						}
 					}
 
@@ -1773,7 +1773,7 @@
 						// text-align: right;
 						font-size: 22rpx;
 						margin: 10rpx 0;
-						color: #CA847E;
+						color: #ff6e00;
 						border-top: 1rpx solid rgba(0, 0, 0, 0.3);
 						padding-top: 10rpx;
 					}
@@ -2022,7 +2022,7 @@
 					}
 
 					.text2 {
-						color: #CD854E;
+						color: #ff6e00;
 					}
 				}
 
@@ -2074,7 +2074,7 @@
 				}
 
 				.text {
-					background-color: #09AA8C;
+					background-color: #00a3a0;
 					color: #fff;
 				}
 			}
@@ -2083,7 +2083,7 @@
 				margin: 40rpx auto;
 				width: 404rpx;
 				height: 57rpx;
-				border: 4rpx solid #26B49A;
+				border: 4rpx solid #00a3a0;
 				border-radius: 20rpx;
 				overflow: hidden;
 
@@ -2099,11 +2099,11 @@
 				}
 
 				.text {
-					background-color: #26B49A;
+					background-color: #00a3a0;
 					color: #fff;
 				}
 			}
 		}
 
 	}
-</style>
+</style>

pages/shop/goods-info.vue

@@ -107,7 +107,7 @@
 					确认下单
 				</view>
 			</view>
-		</u-popup>
+		</u-popup>
 		<u-back-top :scroll-top="scrollTop" :custom-style="{background:'#F6DE87'}" :iconStyle="{color:'#fff',fontSize: '38rpx'}"></u-back-top>
 	</view>
 </template>
@@ -123,7 +123,7 @@
 				show: false,
 				count: 1,
 				skuitem: {},
-				skuindex: 0,
+				skuindex: 0,
 				scrollTop:0
 			}
 		},
@@ -132,39 +132,39 @@
 			this.getdata()
 		},
 		onPageScroll(e) {
-			var a = e.scrollTop / 200
+			var a = e.scrollTop / 200
 			this.scrollTop = e.scrollTop;
 			if (a > 1) {
 				this.opacity = 1
 			} else {
 				this.opacity = a
 			}
-		},
-		onShareAppMessage(){
-			
 		},
-		methods: {
-			getindex(index){
-				var arr = []
-				this.list.forEach(val => {
-					arr.push(val.src)
-				})
-				this.$openimg(arr,index)
-				// console.log(index);
-			},
-			tokefu(){
-				uni.navigateTo({
-					url:'../mine/all-tips?type=23'
-				})
+		onShareAppMessage(){
+			
+		},
+		methods: {
+			getindex(index){
+				var arr = []
+				this.list.forEach(val => {
+					arr.push(val.src)
+				})
+				this.$openimg(arr,index)
+				// console.log(index);
+			},
+			tokefu(){
+				uni.navigateTo({
+					url:'../mine/all-tips?type=23'
+				})
 			},
-			add() {
-				if(this.count >= this.skuitem.stock_number){
-					return
-				}
-				if(this.count >= this.goodsinfo.buy_limit_number){
-					return
-				}else{
-					this.count = this.count + 1
+			add() {
+				if(this.count >= this.skuitem.stock_number){
+					return
+				}
+				if(this.count >= this.goodsinfo.buy_limit_number){
+					return
+				}else{
+					this.count = this.count + 1
 				}
 			},
 			jian() {
@@ -176,15 +176,15 @@
 			},
 			changesku(index) {
 				this.skuindex = index
-				this.skuitem = this.goodsinfo.specifications[this.skuindex]
-				if(this.count == 0){
-					this.count = 1
-				}
-				if(this.count > this.skuitem.stock_number){
-					this.count = this.skuitem.stock_number
-				}
-				if(this.count > this.goodsinfo.buy_limit_number){
-					this.count = this.goodsinfo.buy_limit_number
+				this.skuitem = this.goodsinfo.specifications[this.skuindex]
+				if(this.count == 0){
+					this.count = 1
+				}
+				if(this.count > this.skuitem.stock_number){
+					this.count = this.skuitem.stock_number
+				}
+				if(this.count > this.goodsinfo.buy_limit_number){
+					this.count = this.goodsinfo.buy_limit_number
 				}
 			},
 			openmap(item) {
@@ -203,7 +203,7 @@
 				}).then(res => {
 					this.list = res.response.details_gather
 					this.goodsinfo = res.response
-					// this.skuitem = this.goodsinfo.specifications[0]
+					// this.skuitem = this.goodsinfo.specifications[0]
 					this.changesku(0)
 					const regex = new RegExp('<img', 'gi')
 					const regex1 = new RegExp('<table', 'gi')
@@ -213,30 +213,30 @@
 					this.content = this.content.replace(regex1, `<table style="max-width:100% !important"`)
 					this.content = this.content.replace(regex2, ``)
 				})
-			},
-			tobuy(){
-				if(this.count == 0){
-					this.$u.toast("库存不足或已限购")
-					return
-				}
-				this.show = false
-				var obj = this.skuitem
-				obj.count = this.count
-				obj.goodsname = this.goodsinfo.title
-				obj.goodsdesc = this.goodsinfo.desc
-				obj.buy_limit_number = this.goodsinfo.buy_limit_number
-				if(uni.getStorageSync("token")){
-					uni.navigateTo({
-						url: "./xiadan?obj=" + encodeURIComponent(JSON.stringify(obj))
-					})
-				}else{
-					uni.navigateTo({
-						url:"../mine/login-wx"
-					})
-				}
-				
 			},
-			topay() {
+			tobuy(){
+				if(this.count == 0){
+					this.$u.toast("库存不足或已限购")
+					return
+				}
+				this.show = false
+				var obj = this.skuitem
+				obj.count = this.count
+				obj.goodsname = this.goodsinfo.title
+				obj.goodsdesc = this.goodsinfo.desc
+				obj.buy_limit_number = this.goodsinfo.buy_limit_number
+				if(uni.getStorageSync("token")){
+					uni.navigateTo({
+						url: "./xiadan?obj=" + encodeURIComponent(JSON.stringify(obj))
+					})
+				}else{
+					uni.navigateTo({
+						url:"../mine/login-wx"
+					})
+				}
+				
+			},
+			topay() {
 				this.show = true
 				
 			},
@@ -266,7 +266,7 @@
 				height: 80rpx;
 				text-align: center;
 				line-height: 80rpx;
-				background-color: #F7CB16;
+				background-color: #F7CB16;
 				border-radius: 10rpx;
 			}
 
@@ -297,14 +297,14 @@
 					margin-right: 10rpx;
 					padding: 6rpx 20rpx;
 					border-radius: 10rpx;
-					border: 1rpx solid #09AA8C;
-					color: #09AA8C;
+					border: 1rpx solid #00a3a0;
+					color: #00a3a0;
 					font-size: 26rpx;
 				}
 
 				.text {
 					color: #fff;
-					background-color: #09AA8C;
+					background-color: #00a3a0;
 				}
 			}
 
@@ -351,7 +351,7 @@
 			left: 0;
 			width: 750rpx;
 			height: 126rpx;
-			background-color: #09AA8C;
+			background-color: #00a3a0;
 
 			.tobuy {
 				width: 433rpx;
@@ -361,7 +361,7 @@
 				font-size: 42rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				background-color: #FDCE1C;
+				background-color: #fff;
 				height: 79rpx;
 				margin: 0 54rpx;
 			}
@@ -514,4 +514,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/shop/myshop.vue

@@ -1,119 +1,119 @@
-<template>
-	<view class="myshop">
-		<u-navbar :background="{background:'#2AA47F'}" title="我的店铺" :borderBottom="false"
-			title-color="#fff" back-icon-color="#fff">
-			<view class="left-box u-flex u-col-center" slot="left">
-				<!-- <view style="width: 47rpx;height: 43rpx;position: relative;margin-right: 25rpx;" @click="toxiaoxi">
-					<image src="../../static/images/index1-2.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
-					<text style="position: absolute;top: -20rpx;right: -10rpx;font-size: 22rpx;width: 30rpx;height: 30rpx;text-align: center;line-height: 30rpx;border-radius: 100rpx;color: #fff;background-color: red;">{{count > 99 ? '99+' : count}}</text>
-				</view> -->
-				<image @click="tocode" src="../../static/images/index1-3.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
-			</view>
-		</u-navbar>
-		<view class="shop-item" v-for="(item,index) in userdata.business_admin" :key="index">
-			<view class="top u-flex u-col-top u-row-between">
-				<text>{{item.title}}</text>
-				<text>{{item.status == 0 ? '关闭' : '正常'}}</text>
-			</view>
-			<view class="jianjie">
-				{{item.location_address}} {{item.address}}
-			</view>
-			<view class="name">
-				{{item.business_title}}
-			</view>
-			<view class="u-flex u-col-center u-row-right">
-				<x-button :width="221" :height="76" color="#000" fontSize="25rpx" borderRadius="20rpx" @click="toorder(item)">查看订单</x-button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data(){
-			return{
-				count:0,
-				userdata:{}
-			}
-		},
-		onLoad() {
-			
-		},
-		onShow() {
-			if (uni.getStorageSync("token")) {
-				this.getuser()
-			} else {
-				this.userdata = {}
-			}
-		},
-		methods:{
-			tocode(){
-				this.$opencode()
-			},
-			getuser() {
-				this.$u.post('/User/getDetail').then(res => {
-					if (res.code == 0) {
-						this.userdata = res.response
-					} else {
-						this.$u.toast(res.msg)
-						this.userdata = {}
-						this.$tologin(res.msg)
-					}
-				})
-			},
-			toorder(item){
-				uni.navigateTo({
-					url:"./shop-order?id=" + item.id
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.myshop{
-		.shop-item{
-			width: 707rpx;
-			// height: 257rpx;
-			margin: 20rpx auto;
-			border-radius: 20rpx;
-			padding: 23rpx 32rpx;
-			background-color: #fff;
-			.name{
-				margin-bottom: 9rpx;
-				text-align: right;
-				font-size: 25rpx;
-				font-family: SimHei;
-				font-weight: 400;
-				color: #959595;
-			}
-			.jianjie{
-				font-size: 31rpx;
-				font-family: SimHei;
-				font-weight: 400;
-				margin-bottom: 32rpx;
-			}
-			.top{
-				margin-bottom: 18rpx;
-				text:first-child{
-					font-size: 31rpx;
-					font-family: SimHei;
-					font-weight: 400;
-				}
-				text:last-child{
-					font-size: 31rpx;
-					font-family: SimHei;
-					font-weight: 400;
-					color: #08AA8C;
-				}
-			}
-		}
-		.left-box {
-			padding: 0 25rpx;
-		
-			image {
-				margin-right: 25rpx;
-			}
-		}
-	}
-</style>
+<template>
+	<view class="myshop">
+		<u-navbar :background="{background:'#00a3a0'}" title="我的店铺" :borderBottom="false"
+			title-color="#fff" back-icon-color="#fff">
+			<view class="left-box u-flex u-col-center" slot="left">
+				<!-- <view style="width: 47rpx;height: 43rpx;position: relative;margin-right: 25rpx;" @click="toxiaoxi">
+					<image src="../../static/images/index1-2.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
+					<text style="position: absolute;top: -20rpx;right: -10rpx;font-size: 22rpx;width: 30rpx;height: 30rpx;text-align: center;line-height: 30rpx;border-radius: 100rpx;color: #fff;background-color: red;">{{count > 99 ? '99+' : count}}</text>
+				</view> -->
+				<image @click="tocode" src="../../static/images/index1-3.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
+			</view>
+		</u-navbar>
+		<view class="shop-item" v-for="(item,index) in userdata.business_admin" :key="index">
+			<view class="top u-flex u-col-top u-row-between">
+				<text>{{item.title}}</text>
+				<text>{{item.status == 0 ? '关闭' : '正常'}}</text>
+			</view>
+			<view class="jianjie">
+				{{item.location_address}} {{item.address}}
+			</view>
+			<view class="name">
+				{{item.business_title}}
+			</view>
+			<view class="u-flex u-col-center u-row-right">
+				<x-button :width="221" :height="76" color="#000" fontSize="25rpx" borderRadius="20rpx" @click="toorder(item)">查看订单</x-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				count:0,
+				userdata:{}
+			}
+		},
+		onLoad() {
+			
+		},
+		onShow() {
+			if (uni.getStorageSync("token")) {
+				this.getuser()
+			} else {
+				this.userdata = {}
+			}
+		},
+		methods:{
+			tocode(){
+				this.$opencode()
+			},
+			getuser() {
+				this.$u.post('/User/getDetail').then(res => {
+					if (res.code == 0) {
+						this.userdata = res.response
+					} else {
+						this.$u.toast(res.msg)
+						this.userdata = {}
+						this.$tologin(res.msg)
+					}
+				})
+			},
+			toorder(item){
+				uni.navigateTo({
+					url:"./shop-order?id=" + item.id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.myshop{
+		.shop-item{
+			width: 707rpx;
+			// height: 257rpx;
+			margin: 20rpx auto;
+			border-radius: 20rpx;
+			padding: 23rpx 32rpx;
+			background-color: #fff;
+			.name{
+				margin-bottom: 9rpx;
+				text-align: right;
+				font-size: 25rpx;
+				font-family: SimHei;
+				font-weight: 400;
+				color: #959595;
+			}
+			.jianjie{
+				font-size: 31rpx;
+				font-family: SimHei;
+				font-weight: 400;
+				margin-bottom: 32rpx;
+			}
+			.top{
+				margin-bottom: 18rpx;
+				text:first-child{
+					font-size: 31rpx;
+					font-family: SimHei;
+					font-weight: 400;
+				}
+				text:last-child{
+					font-size: 31rpx;
+					font-family: SimHei;
+					font-weight: 400;
+					color: #00a3a0;
+				}
+			}
+		}
+		.left-box {
+			padding: 0 25rpx;
+		
+			image {
+				margin-right: 25rpx;
+			}
+		}
+	}
+</style>

pages/shop/search.vue

@@ -83,8 +83,8 @@
 					<text v-for="(item,index) in lishilist" :key="index" @tap="searchkey(item)">{{item}}</text>
 				</view>
 			</view>
-		</view>
-		<x-notdata v-if="goodslist.length == 0 && showgoods" tips="无相关数据" @shuaxin="tosearch(1)"></x-notdata>
+		</view>
+		<x-notdata v-if="goodslist.length == 0 && showgoods" tips="无相关数据" @shuaxin="tosearch(1)"></x-notdata>
 		<view class="goods-box">
 			<view class="goods-item" v-for="(item,index) in goodslist" :key="index" @tap="toinfo(item)">
 				<image :src="item.master_image" mode=""></image>
@@ -104,7 +104,7 @@
 			</view>
 		</view>
 		<view @tap="changeadd" class="change-add-box u-flex u-col-center u-row-right" style="padding: 10rpx 20rpx;background-color: rgba(256,256,256,1);border-radius: 100rpx;font-size: 24rpx;position: fixed;bottom: 50rpx;right: 20rpx;max-width: 700rpx;">
-			<span style="flex: 1;color: #2AA47F;margin-right: 10rpx;">{{nowaddresstext}}</span>
+			<span style="flex: 1;color: #00a3a0;margin-right: 10rpx;">{{nowaddresstext}}</span>
 			<image src="../../static/images/qiehuan.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
 		</view>
 	</view>
@@ -139,14 +139,14 @@
 			if (uni.getStorageSync("lishi")) {
 				this.lishilist = uni.getStorageSync("lishi")
 			}
-		},
-		onPullDownRefresh() {
-			if(this.showgoods){
-				this.tosearch()
-			}else{
-				this.getaddress()
-				this.gettype()
-			}
+		},
+		onPullDownRefresh() {
+			if(this.showgoods){
+				this.tosearch()
+			}else{
+				this.getaddress()
+				this.gettype()
+			}
 		},
 		onReachBottom() {
 			if (this.goodslist.length != this.count) {
@@ -175,7 +175,7 @@
 					success: (res) => {
 						this.nowaddresstext = res[0].name
 						this.latitude = res[0].latitude
-						this.longitude = res[0].longitude
+						this.longitude = res[0].longitude
 						uni.stopPullDownRefresh()
 					},
 					fail: (err) => {
@@ -259,7 +259,7 @@
 				}).then(res => {
 					if (str == 1) {
 						this.$u.toast("刷新成功")
-					}
+					}
 					uni.stopPullDownRefresh()
 					this.count = res.response.count
 					if (this.page == 1) {
@@ -491,13 +491,13 @@
 				text {
 					padding: 10rpx 23rpx;
 					border-radius: 10rpx;
-					border: 2rpx solid #2AA47F;
+					border: 2rpx solid #00a3a0;
 					margin-right: 30rpx;
 					margin-bottom: 20rpx;
 					font-size: 25rpx;
 					font-family: SimHei;
 					font-weight: 400;
-					color: #08AA8C;
+					color: #00a3a0;
 				}
 			}
 
@@ -527,7 +527,7 @@
 				height: 66rpx;
 				border-radius: 20rpx;
 				text-align: center;
-				background-color: #2AA47F;
+				background-color: #00a3a0;
 				font-size: 31rpx;
 				font-family: SimHei;
 				font-weight: 400;
@@ -539,7 +539,7 @@
 				width: 532rpx;
 				height: 65rpx;
 				border-radius: 20rpx;
-				border: 3rpx solid #2AA47F;
+				border: 3rpx solid #00a3a0;
 				padding: 0 21rpx;
 
 				input {
@@ -554,4 +554,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/shop/shop-order.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="shop-order">
-		<u-navbar :background="{background:'#2AA47F'}" title="店铺订单" :borderBottom="false" title-color="#fff" back-icon-color="#fff">
+		<u-navbar :background="{background:'#00a3a0'}" title="店铺订单" :borderBottom="false" title-color="#fff" back-icon-color="#fff">
 			<view class="left-box u-flex u-col-center" slot="left">
 				<image @click="tocode" src="../../static/images/index1-3.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
 			</view>
@@ -161,7 +161,7 @@
 			</view>
 			<x-notdata v-if="list.length == 0" tips="无相关数据" @shuaxin="tosearch(1)"></x-notdata>
 		</view>
-		<u-calendar v-model="showtime" mode="date" @clicktime="changetime" @change="cleartime" active-bg-color="#2AA47F" btn-type="default"></u-calendar>
+		<u-calendar v-model="showtime" mode="date" @clicktime="changetime" @change="cleartime" active-bg-color="#00a3a0" btn-type="default"></u-calendar>
 	</view>
 </template>
 
@@ -594,7 +594,7 @@
 				height: 66rpx;
 				border-radius: 20rpx;
 				text-align: center;
-				background-color: #2AA47F;
+				background-color: #00a3a0;
 				font-size: 31rpx;
 				font-family: SimHei;
 				font-weight: 400;
@@ -606,7 +606,7 @@
 				width: 532rpx;
 				height: 65rpx;
 				border-radius: 20rpx;
-				border: 3rpx solid #2AA47F;
+				border: 3rpx solid #00a3a0;
 				padding: 0 21rpx;
 
 				input {
@@ -621,4 +621,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/shop/shop-orderinfo.vue

@@ -80,13 +80,13 @@
 			<x-button :width="160" :height="70" color="#000" fontSize="25rpx" borderRadius="20rpx" @click="show = true" v-if="orderdata.order_status < 2">核销订单</x-button>
 			<x-button :width="160" :height="70" style="margin-left: 20rpx;" color="#000" fontSize="25rpx" borderRadius="20rpx" @click="tojindu">服务进度</x-button>
 		</view>
-		<u-modal v-model="show" title="选择核销店铺" :show-cancel-button="true" @confirm="hexiao" confirm-text="确认核销" confirm-color="#2AA47F">
+		<u-modal v-model="show" title="选择核销店铺" :show-cancel-button="true" @confirm="hexiao" confirm-text="确认核销" confirm-color="#00a3a0">
 			<view class="slot-content" style="padding: 30rpx 0;">
-				<u-radio-group v-model="value" active-color="#2AA47F">
-					<view class="u-flex-col" style="padding: 0 50rpx;">
-						<u-radio v-for="(item, index) in list" :key="index" :name="item.id">
-							{{item.title}}
-						</u-radio>
+				<u-radio-group v-model="value" active-color="#00a3a0">
+					<view class="u-flex-col" style="padding: 0 50rpx;">
+						<u-radio v-for="(item, index) in list" :key="index" :name="item.id">
+							{{item.title}}
+						</u-radio>
 					</view>
 				</u-radio-group>
 			</view>
@@ -101,30 +101,30 @@
 				id: '',
 				url: '',
 				orderdata: {},
-				show: false,
-				list:[],
+				show: false,
+				list:[],
 				value:'',
 			}
 		},
 		onLoad(option) {
 			this.id = option.id
 			this.url = option.url
-		},
-		onShow() {
-			if(uni.getStorageSync("token")){
-				this.getdata()
-			}else{
-				this.$u.toast("请登录")
-				setTimeout(() => {
-					uni.navigateTo({
-						url:"/pages/mine/login-wx"
-					})
-				},800)
-				
-			}
+		},
+		onShow() {
+			if(uni.getStorageSync("token")){
+				this.getdata()
+			}else{
+				this.$u.toast("请登录")
+				setTimeout(() => {
+					uni.navigateTo({
+						url:"/pages/mine/login-wx"
+					})
+				},800)
+				
+			}
 		},
 		methods: {
-			hexiao() {
+			hexiao() {
 				this.$u.post('/BusinessAdmin/writeOff', {
 					content: {
 						business_shop_id: this.value,
@@ -153,10 +153,10 @@
 							order_no: this.id
 						}
 					}).then(res => {
-						this.orderdata = res.response
-						this.list = res.response.business_admin
-						if(this.list.length > 0){
-							this.value = this.list[0].id
+						this.orderdata = res.response
+						this.list = res.response.business_admin
+						if(this.list.length > 0){
+							this.value = this.list[0].id
 						}
 					})
 				} else {
@@ -166,13 +166,13 @@
 						}
 					}).then(res => {
 						if (res.code == 0) {
-							this.orderdata = res.response
-							this.list = res.response.business_admin
-							if(this.list.length > 0){
-								this.value = this.list[0].id
+							this.orderdata = res.response
+							this.list = res.response.business_admin
+							if(this.list.length > 0){
+								this.value = this.list[0].id
 							}
 						} else {
-							this.$u.toast(res.msg)
+							this.$u.toast(res.msg)
 							this.$tologin(res.msg)
 						}
 						// this.orderdata = res.response
@@ -329,4 +329,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/shop/shop.vue

@@ -26,7 +26,7 @@
 		<image @click="openad" v-if="oneimage.advertise_image" :src="oneimage.advertise_image" class="img-box" mode="">
 		</image>
 		<view class="tabs-box">
-			<u-tabs :list="list" :is-scroll="false" active-color="#2AA47F" :isScroll="true" :current="current" @change="change" name="title"></u-tabs>
+			<u-tabs :list="list" :is-scroll="false" active-color="#00a3a0" :isScroll="true" :current="current" @change="change" name="title"></u-tabs>
 		</view>
 		<view class="goods-item1" v-for="(item,index) in goodslist" :key="index" @tap="toinfo(item)">
 			<image :src="item.master_image" mode=""></image>
@@ -63,7 +63,7 @@
 			</view>
 		</view> -->
 		<view @tap="changeadd" class="change-add-box u-flex u-col-center u-row-right" style="padding: 10rpx 20rpx;background-color: rgba(256,256,256,0.6);border-radius: 100rpx;font-size: 24rpx;position: fixed;bottom: 150rpx;right: 20rpx;max-width: 700rpx;">
-			<span style="flex: 1;color: #2AA47F;margin-right: 10rpx;">{{nowaddresstext}}</span>
+			<span style="flex: 1;color: #00a3a0;margin-right: 10rpx;">{{nowaddresstext}}</span>
 			<image src="../../static/images/qiehuan.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
 		</view>
 		<x-tabbar ref="tabbar"></x-tabbar>
@@ -112,7 +112,7 @@
 				})
 				this.getorder()
 			} else {
-				this.$refs.nav.count = 0
+				this.$refs.nav.count = 0
 				this.$refs.tabbar.setbadge(0)
 				uni.removeTabBarBadge({
 					index: 1,
@@ -124,13 +124,13 @@
 				uni.chooseLocation({
 					latitude: this.lat,
 					longitude: this.lng,
-					success: (res) => {
-						if(res.name){
-							this.lat = res.latitude
-							this.lng = res.longitude
-							this.nowaddresstext = res.name
-							this.page = 1
-							this.getgoods()
+					success: (res) => {
+						if(res.name){
+							this.lat = res.latitude
+							this.lng = res.longitude
+							this.nowaddresstext = res.name
+							this.page = 1
+							this.getgoods()
 						}
 					}
 				})
@@ -328,7 +328,7 @@
 					width: 350rpx;
 					height: 350rpx;
 
-					background-color: #2AA47F;
+					background-color: #00a3a0;
 				}
 
 				.price {
@@ -394,7 +394,7 @@
 		.img-box {
 			width: 750rpx;
 			height: 417rpx;
-			background-color: #2AA47F;
+			background-color: #00a3a0;
 			margin-bottom: 20rpx;
 		}
 
@@ -413,7 +413,7 @@
 				image {
 					width: 309rpx;
 					height: 309rpx;
-					background-color: #2AA47F;
+					background-color: #00a3a0;
 				}
 
 				.name {
@@ -471,4 +471,4 @@
 		}
 
 	}
-</style>
+</style>

pages/shop/xiadan.vue

@@ -33,23 +33,23 @@
 				<text class="left">{{skuitem.title}}:{{skuitem.desc}}</text>
 			</view>
 			<view class="taocan">
-				<u-radio-group v-model="value" active-color="#08AA8C">
+				<u-radio-group v-model="value" active-color="#00a3a0">
 					<u-radio :name="0">不需要发票</u-radio>
 					<u-radio :name="1">索取发票</u-radio>
-				</u-radio-group>
-				<view class="input u-flex u-col-center" v-if="value == 1">
-					<text style="margin-right: 20rpx;">发票抬头:</text>
-					<input type="text" placeholder="填写发票抬头" v-model="fapiao"/>
+				</u-radio-group>
+				<view class="input u-flex u-col-center" v-if="value == 1">
+					<text style="margin-right: 20rpx;">发票抬头:</text>
+					<input type="text" placeholder="填写发票抬头" v-model="fapiao"/>
+				</view>
+			</view>
+			<picker mode="selector" :range="peisong" @change="changepeisong">
+				<view class="peisong-box u-flex u-col-center u-row-between">
+					<text class="text">配送方式</text>
+					<view class="right u-flex u-col-center">
+						<text class="text1">{{peisongtext}}</text>
+						<u-icon name="arrow-right" color="#00a3a0"></u-icon>
+					</view>
 				</view>
-			</view>
-			<picker mode="selector" :range="peisong" @change="changepeisong">
-				<view class="peisong-box u-flex u-col-center u-row-between">
-					<text class="text">配送方式</text>
-					<view class="right u-flex u-col-center">
-						<text class="text1">{{peisongtext}}</text>
-						<u-icon name="arrow-right" color="#08AA8C"></u-icon>
-					</view>
-				</view>
 			</picker>
 			
 		</view>
@@ -64,9 +64,9 @@
 				<view class="address-text">
 					{{address.address}}{{address.location_address}}
 				</view>
-			</view>
-			<view style="text-align: center;margin-bottom: 20rpx;" v-else>
-				暂无收货地址
+			</view>
+			<view style="text-align: center;margin-bottom: 20rpx;" v-else>
+				暂无收货地址
 			</view>
 			<view class="price1 u-flex u-col-center u-row-right">
 				<text class="text1">¥{{yuohui.payment_price || ''}}</text>
@@ -75,8 +75,8 @@
 				</view>
 			</view>
 			<!-- <view class="xieyi-box u-flex u-col-center u-row-right">
-				<u-checkbox v-model="checked" active-color="#08AA8C">请阅读并同意</u-checkbox>
-				<view class="text u-flex u-col-center" style="color: #08AA8C;" @tap="toxieyi">
+				<u-checkbox v-model="checked" active-color="#00a3a0">请阅读并同意</u-checkbox>
+				<view class="text u-flex u-col-center" style="color: #00a3a0;" @tap="toxieyi">
 					《平台用户服务协议》
 				</view>
 			</view> -->
@@ -90,158 +90,158 @@
 			return {
 				value: 0,
 				checked: true,
-				skuitem: {},
-				peisong:['到家','到店','送货上门'],
-				peisongtext:'到家',
-				peisongid:1,
-				address:{},
-				fapiao:'',
-				yuohui:{},
+				skuitem: {},
+				peisong:['到家','到店','送货上门'],
+				peisongtext:'到家',
+				peisongid:1,
+				address:{},
+				fapiao:'',
+				yuohui:{},
 				order_id:''
 			}
 		},
 		onLoad(option) {
-			this.skuitem = JSON.parse(decodeURIComponent(option.obj))
-			this.xiadan(1)
+			this.skuitem = JSON.parse(decodeURIComponent(option.obj))
+			this.xiadan(1)
 			console.log(this.skuitem);
-		},
-		onShow() {
-			this.getaddress()
 		},
-		methods: {
-			xiadan(type){
-				if(type == 0){
-					if(!this.checked){
-						this.$u.toast('请勾选协议')
-						return
-					}
-					if(!this.address.id){
-						this.$u.toast("请添加地址")
-						return
-					}
-					if(this.value == 1){
-						if(!this.fapiao){
-							this.$u.toast('请填写发票抬头')
-							return
-						}
-					}
-				}
-				this.$u.post('/OrderBusinessProduct/add',{
-					content:{
-						business_product_id:this.skuitem.business_product_id,
-						business_product_specifications_id:this.skuitem.id,
-						invoice_title:this.fapiao,
-						is_check:type,
-						is_invoice:this.value,
-						number:this.skuitem.count,
-						pickup_method:this.peisongid,
-						user_address_id:this.address.id,
-					}
-				}).then(res => {
-					if(res.code == 0){
-						if(type == 1){
-							this.yuohui = res.response
-						}else{
-							this.order_id = res.response.order_no
-							this.wxpay()
-						}
-					}else{
-						this.$u.toast(res.msg)
-						this.$tologin(res.msg)
-					}
-				})
-			},
-			wxpay(){
-				this.$u.post('/Order/payment',{
-					content:{
-						order_no:this.order_id,
-						type:1
-					}
-				}).then(res => {
-					if(res.code == 0){
-						uni.requestPayment({
-							nonceStr:res.response.nonceStr,
-							package:res.response.package,
-							paySign:res.response.paySign,
-							signType:res.response.signType,
-							timeStamp:res.response.timeStamp,
-							success: (res) => {
-								this.$u.toast("支付成功")
-								setTimeout(() => {
-									uni.navigateTo({
-										url:"../order/order-info?id=" + this.order_id
-									})
-								},800)
-								console.log(res);
-							},
-							fail:(err) => {
-								this.$u.toast("支付失败")
-								setTimeout(() => {
-									uni.navigateTo({
-										url:"../order/order-info?id=" + this.order_id
-									})
-								},800)
-								console.log(err);
-							}
-						})
-					}else{
-						this.$u.toast(res.msg)
-						this.$tologin(res.msg)
-					}
-				})
-			},
-			changeaddress(){
-				uni.navigateTo({
-					url:"../mine/address-list?type=1",
-					events:{
-						changeadd:(res) => {
-							this.address = res
-						}
-					}
-				})
-			},
-			toxieyi(){
-				uni.navigateTo({
-					url:"../mine/all-tips?type=11"
-				})
-			},
-			getaddress(){
-				this.$u.post('/UserAddress/list',{
-					content:{
-						erow:1,
-						list_type:'limit',
-						srow:0
-					}
-				}).then(res => {
-					if(res.response.data.length > 0){
-						if(!this.address.id){
-							this.address = res.response.data[0]
-						}
-					}else{
-						this.address = {}
-						this.$tologin(res.msg)
-					}
-				})
-			},
-			changepeisong(e){
-				this.peisongtext = this.peisong[e.detail.value]
-				this.peisongid = e.detail.value == 0 ? 1 : e.detail.value == 1 ? 2 : 3
+		onShow() {
+			this.getaddress()
+		},
+		methods: {
+			xiadan(type){
+				if(type == 0){
+					if(!this.checked){
+						this.$u.toast('请勾选协议')
+						return
+					}
+					if(!this.address.id){
+						this.$u.toast("请添加地址")
+						return
+					}
+					if(this.value == 1){
+						if(!this.fapiao){
+							this.$u.toast('请填写发票抬头')
+							return
+						}
+					}
+				}
+				this.$u.post('/OrderBusinessProduct/add',{
+					content:{
+						business_product_id:this.skuitem.business_product_id,
+						business_product_specifications_id:this.skuitem.id,
+						invoice_title:this.fapiao,
+						is_check:type,
+						is_invoice:this.value,
+						number:this.skuitem.count,
+						pickup_method:this.peisongid,
+						user_address_id:this.address.id,
+					}
+				}).then(res => {
+					if(res.code == 0){
+						if(type == 1){
+							this.yuohui = res.response
+						}else{
+							this.order_id = res.response.order_no
+							this.wxpay()
+						}
+					}else{
+						this.$u.toast(res.msg)
+						this.$tologin(res.msg)
+					}
+				})
 			},
-			add() {
-				if(this.skuitem.count >= this.skuitem.stock_number){
-					return
-				}
-				if(this.skuitem.count >= this.skuitem.buy_limit_number){
-					return
+			wxpay(){
+				this.$u.post('/Order/payment',{
+					content:{
+						order_no:this.order_id,
+						type:1
+					}
+				}).then(res => {
+					if(res.code == 0){
+						uni.requestPayment({
+							nonceStr:res.response.nonceStr,
+							package:res.response.package,
+							paySign:res.response.paySign,
+							signType:res.response.signType,
+							timeStamp:res.response.timeStamp,
+							success: (res) => {
+								this.$u.toast("支付成功")
+								setTimeout(() => {
+									uni.navigateTo({
+										url:"../order/order-info?id=" + this.order_id
+									})
+								},800)
+								console.log(res);
+							},
+							fail:(err) => {
+								this.$u.toast("支付失败")
+								setTimeout(() => {
+									uni.navigateTo({
+										url:"../order/order-info?id=" + this.order_id
+									})
+								},800)
+								console.log(err);
+							}
+						})
+					}else{
+						this.$u.toast(res.msg)
+						this.$tologin(res.msg)
+					}
+				})
+			},
+			changeaddress(){
+				uni.navigateTo({
+					url:"../mine/address-list?type=1",
+					events:{
+						changeadd:(res) => {
+							this.address = res
+						}
+					}
+				})
+			},
+			toxieyi(){
+				uni.navigateTo({
+					url:"../mine/all-tips?type=11"
+				})
+			},
+			getaddress(){
+				this.$u.post('/UserAddress/list',{
+					content:{
+						erow:1,
+						list_type:'limit',
+						srow:0
+					}
+				}).then(res => {
+					if(res.response.data.length > 0){
+						if(!this.address.id){
+							this.address = res.response.data[0]
+						}
+					}else{
+						this.address = {}
+						this.$tologin(res.msg)
+					}
+				})
+			},
+			changepeisong(e){
+				this.peisongtext = this.peisong[e.detail.value]
+				this.peisongid = e.detail.value == 0 ? 1 : e.detail.value == 1 ? 2 : 3
+			},
+			add() {
+				if(this.skuitem.count >= this.skuitem.stock_number){
+					return
+				}
+				if(this.skuitem.count >= this.skuitem.buy_limit_number){
+					return
 				}
-				this.skuitem.count = this.skuitem.count + 1
+				this.skuitem.count = this.skuitem.count + 1
 				this.xiadan(1)
 			},
 			jian() {
 				if (this.skuitem.count <= 1) {
 
 				} else {
-					this.skuitem.count = this.skuitem.count - 1
+					this.skuitem.count = this.skuitem.count - 1
 					this.xiadan(1)
 				}
 			}
@@ -308,7 +308,7 @@
 				font-size: 31rpx;
 				font-family: SimHei;
 				font-weight: 400;
-				color: #08AA8C;
+				color: #00a3a0;
 				padding: 20rpx 0;
 			}
 		}
@@ -329,7 +329,7 @@
 						font-size: 31rpx;
 						font-family: SimHei;
 						font-weight: 400;
-						color: #08AA8C;
+						color: #00a3a0;
 					}
 				}
 
@@ -343,12 +343,12 @@
 			.taocan {
 				padding: 20rpx 0;
 				border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
-				.input{
-					input{
-						flex: 1;
-						border-bottom: 2rpx solid #2AA47F;
-						padding: 0 20rpx;
-					}
+				.input{
+					input{
+						flex: 1;
+						border-bottom: 2rpx solid #00a3a0;
+						padding: 0 20rpx;
+					}
 				}
 				.right {
 					.shuoming {
@@ -435,4 +435,4 @@
 			}
 		}
 	}
-</style>
+</style>

project.config.json

@@ -0,0 +1,45 @@
+{
+  "appid": "wx37fa2b690a4cf983",
+  "compileType": "miniprogram",
+  "libVersion": "2.17.0",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "lazyloadPlaceholderEnable": false,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "autoAudits": false,
+    "uglifyFileName": false,
+    "uploadWithSourceMap": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "useStaticServer": true,
+    "showES6CompileOption": false,
+    "checkInvalidKey": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "minifyWXML": true
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "simulatorPluginLibVersion": {},
+  "isGameTourist": false
+}

project.private.config.json

@@ -0,0 +1,9 @@
+{
+  "projectname": "%E5%B0%8F%E9%A9%AC%E5%8F%AE%E5%8F%AE",
+  "setting": {
+    "compileHotReLoad": true,
+    "urlCheck": false
+  },
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "condition": {}
+}

uview-ui/components/u-calendar/u-calendar.vue

@@ -1,641 +1,641 @@
-<template>
-	<u-popup closeable :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto"
-	 :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex" :border-radius="borderRadius" :closeable="closeable">
-		<view class="u-calendar">
-			<view class="u-calendar__header">
-				<view class="u-calendar__header__text" v-if="!$slots['tooltip']">
-					{{toolTip}}
-				</view>
-				<slot v-else name="tooltip" />
-			</view>
-			<view class="u-calendar__action u-flex u-row-center">
-				<view class="u-calendar__action__icon">
-					<u-icon v-if="changeYear" name="arrow-left-double" :color="yearArrowColor" @click="changeYearHandler(0)"></u-icon>
-				</view>
-				<view class="u-calendar__action__icon">
-					<u-icon v-if="changeMonth" name="arrow-left" :color="monthArrowColor" @click="changeMonthHandler(0)"></u-icon>
-				</view>
-				<view class="u-calendar__action__text">{{ showTitle }}</view>
-				<view class="u-calendar__action__icon">
-					<u-icon v-if="changeMonth" name="arrow-right" :color="monthArrowColor" @click="changeMonthHandler(1)"></u-icon>
-				</view>
-				<view class="u-calendar__action__icon">
-					<u-icon v-if="changeYear" name="arrow-right-double" :color="yearArrowColor" @click="changeYearHandler(1)"></u-icon>
-				</view>
-			</view>
-			<view class="u-calendar__week-day">
-				<view class="u-calendar__week-day__text" v-for="(item, index) in weekDayZh" :key="index">{{item}}</view>
-			</view>
-			<view class="u-calendar__content">
-				<!-- 前置空白部分 -->
-				<block v-for="(item, index) in weekdayArr" :key="index">
-					<view class="u-calendar__content__item"></view>
-				</block>
-				<view class="u-calendar__content__item" :class="{
-					'u-hover-class':openDisAbled(year,month,index+1),
-					'u-calendar__content--start-date': (mode == 'range' && startDate==`${year}-${month}-${index+1}`) || mode== 'date',
-					'u-calendar__content--end-date':(mode== 'range' && endDate==`${year}-${month}-${index+1}`) || mode == 'date'
-				}" :style="{backgroundColor: getColor(index,1)}" v-for="(item, index) in daysArr" :key="index"
-				 @tap="dateClick(index)">
-					<view class="u-calendar__content__item__inner" :style="{color: getColor(index,2)}">
-						<view>{{ index + 1 }}</view>
-					</view>
-					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && startDate==`${year}-${month}-${index+1}` && startDate!=endDate">{{startText}}</view>
-					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && endDate==`${year}-${month}-${index+1}`">{{endText}}</view>
-				</view>
-				<view class="u-calendar__content__bg-month">{{month}}</view>
-			</view>
-			<view class="u-calendar__bottom">
-				<view class="u-calendar__bottom__choose">
-					<text>{{mode == 'date' ? activeDate : startDate}}</text>
-					<text v-if="endDate">至{{endDate}}</text>
-				</view>
-				<view class="u-calendar__bottom__btn">
-					<u-button :type="btnType" shape="circle" :custom-style="{background:'#2AA47F',color:'#fff'}" size="default" @click="btnFix(false)">清除</u-button>
-				</view>
-			</view>
-		</view>
-	</u-popup>
-</template>
-<script>
-	/**
-	 * calendar 日历
-	 * @description 此组件用于单个选择日期，范围选择日期等，日历被包裹在底部弹起的容器中。
-	 * @tutorial http://uviewui.com/components/calendar.html
-	 * @property {String} mode 选择日期的模式，date-为单个日期，range-为选择日期范围
-	 * @property {Boolean} v-model 布尔值变量，用于控制日历的弹出与收起
-	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
-	 * @property {Boolean} change-year 是否显示顶部的切换年份方向的按钮(默认true)
-	 * @property {Boolean} change-month 是否显示顶部的切换月份方向的按钮(默认true)
-	 * @property {String Number} max-year 可切换的最大年份(默认2050)
-	 * @property {String Number} min-year 可切换的最小年份(默认1950)
-	 * @property {String Number} min-date 最小可选日期(默认1950-01-01)
-	 * @property {String Number} max-date 最大可选日期(默认当前日期)
-	 * @property {String Number} 弹窗顶部左右两边的圆角值，单位rpx(默认20)
-	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭日历(默认true)
-	 * @property {String} month-arrow-color 月份切换按钮箭头颜色(默认#606266)
-	 * @property {String} year-arrow-color 年份切换按钮箭头颜色(默认#909399)
-	 * @property {String} color 日期字体的默认颜色(默认#303133)
-	 * @property {String} active-bg-color 起始/结束日期按钮的背景色(默认#2979ff)
-	 * @property {String Number} z-index 弹出时的z-index值(默认10075)
-	 * @property {String} active-color 起始/结束日期按钮的字体颜色(默认#ffffff)
-	 * @property {String} range-bg-color 起始/结束日期之间的区域的背景颜色(默认rgba(41,121,255,0.13))
-	 * @property {String} range-color 选择范围内字体颜色(默认#2979ff)
-	 * @property {String} start-text 起始日期底部的提示文字(默认 '开始')
-	 * @property {String} end-text 结束日期底部的提示文字(默认 '结束')
-	 * @property {String} btn-type 底部确定按钮的主题(默认 'primary')
-	 * @property {String} toolTip 顶部提示文字，如设置名为tooltip的slot，此参数将失效(默认 '选择日期')
-	 * @property {Boolean} closeable 是否显示右上角的关闭图标(默认true)
-	 * @example <u-calendar v-model="show" :mode="mode"></u-calendar>
-	 */
-	
-	export default {
-		name: 'u-calendar',
-		props: {
-			safeAreaInsetBottom: {
-				type: Boolean,
-				default: false
-			},
-			// 是否允许通过点击遮罩关闭Picker
-			maskCloseAble: {
-				type: Boolean,
-				default: true
-			},
-			// 通过双向绑定控制组件的弹出与收起
-			value: {
-				type: Boolean,
-				default: false
-			},
-			// 弹出的z-index值
-			zIndex: {
-				type: [String, Number],
-				default: 0
-			},
-			// 是否允许切换年份
-			changeYear: {
-				type: Boolean,
-				default: true
-			},
-			// 是否允许切换月份
-			changeMonth: {
-				type: Boolean,
-				default: true
-			},
-			// date-单个日期选择，range-开始日期+结束日期选择
-			mode: {
-				type: String,
-				default: 'date'
-			},
-			// 可切换的最大年份
-			maxYear: {
-				type: [Number, String],
-				default: 2050
-			},
-			// 可切换的最小年份
-			minYear: {
-				type: [Number, String],
-				default: 1950
-			},
-			// 最小可选日期(不在范围内日期禁用不可选)
-			minDate: {
-				type: [Number, String],
-				default: '1950-01-01'
-			},
-			/**
-			 * 最大可选日期
-			 * 默认最大值为今天，之后的日期不可选
-			 * 2030-12-31
-			 * */
-			maxDate: {
-				type: [Number, String],
-				default: ''
-			},
-			// 弹窗顶部左右两边的圆角值
-			borderRadius: {
-				type: [String, Number],
-				default: 20
-			},
-			// 月份切换按钮箭头颜色
-			monthArrowColor: {
-				type: String,
-				default: '#606266'
-			},
-			// 年份切换按钮箭头颜色
-			yearArrowColor: {
-				type: String,
-				default: '#909399'
-			},
-			// 默认日期字体颜色
-			color: {
-				type: String,
-				default: '#303133'
-			},
-			// 选中|起始结束日期背景色
-			activeBgColor: {
-				type: String,
-				default: '#2979ff'
-			},
-			// 选中|起始结束日期字体颜色
-			activeColor: {
-				type: String,
-				default: '#ffffff'
-			},
-			// 范围内日期背景色
-			rangeBgColor: {
-				type: String,
-				default: 'rgba(41,121,255,0.13)'
-			}, 
-			// 范围内日期字体颜色
-			rangeColor: {
-				type: String,
-				default: '#2979ff'
-			},
-			// mode=range时生效，起始日期自定义文案
-			startText: {
-				type: String,
-				default: '开始'
-			},
-			// mode=range时生效，结束日期自定义文案
-			endText: {
-				type: String,
-				default: '结束'
-			},
-			//按钮样式类型
-			btnType: {
-				type: String,
-				default: 'primary'
-			},
-			// 当前选中日期带选中效果
-			isActiveCurrent: {
-				type: Boolean,
-				default: true
-			},
-			// 切换年月是否触发事件 mode=date时生效
-			isChange: {
-				type: Boolean,
-				default: false
-			},
-			// 是否显示右上角的关闭图标
-			closeable: {
-				type: Boolean,
-				default: true
-			},
-			// 顶部的提示文字
-			toolTip: {
-				type: String,
-				default: '选择日期'
-			}
-		},
-		data() {
-			return {
-				// 星期几,值为1-7
-				weekday: 1, 
-				weekdayArr:[],
-				// 当前月有多少天
-				days: 0, 
-				daysArr:[],
-				showTitle: '',
-				year: 2020,
-				month: 0,
-				day: 0,
-				startYear: 0,
-				startMonth: 0,
-				startDay: 0,
-				endYear: 0,
-				endMonth: 0,
-				endDay: 0,
-				today: '',
-				activeDate: '',
-				startDate: '',
-				endDate: '',
-				isStart: true,
-				min: null,
-				max: null,
-				weekDayZh: ['日', '一', '二', '三', '四', '五', '六']
-			};
-		},
-		computed: {
-			dataChange() {
-				return `${this.mode}-${this.minDate}-${this.maxDate}`;
-			},
-			uZIndex() {
-				// 如果用户有传递z-index值，优先使用
-				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
-			}
-		},
-		watch: {
-			dataChange(val) {
-				this.init()
-			}
-		},
-		created() {
-			this.init()
-		},
-		methods: {
-			getColor(index, type) {
-				let color = type == 1 ? '' : this.color;
-				let day = index + 1
-				let date = `${this.year}-${this.month}-${day}`
-				let timestamp = new Date(date.replace(/\-/g, '/')).getTime();
-				let start = this.startDate.replace(/\-/g, '/')
-				let end = this.endDate.replace(/\-/g, '/')
-				if ((this.isActiveCurrent && this.activeDate == date) || this.startDate == date || this.endDate == date) {
-					color = type == 1 ? this.activeBgColor : this.activeColor;
-				} else if (this.endDate && timestamp > new Date(start).getTime() && timestamp < new Date(end).getTime()) {
-					color = type == 1 ? this.rangeBgColor : this.rangeColor;
-				}
-				return color;
-			},
-			init() {
-				let now = new Date();
-				this.year = now.getFullYear();
-				this.month = now.getMonth() + 1;
-				this.day = now.getDate();
-				this.today = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
-				this.activeDate = this.today;
-				this.min = this.initDate(this.minDate);
-				this.max = this.initDate(this.maxDate || this.today);
-				this.startDate = "";
-				this.startYear = 0;
-				this.startMonth = 0;
-				this.startDay = 0;
-				this.endYear = 0;
-				this.endMonth = 0;
-				this.endDay = 0;
-				this.endDate = "";
-				this.isStart = true;
-				this.changeData();
-			},
-			//日期处理
-			initDate(date) {
-				let fdate = date.split('-');
-				return {
-					year: Number(fdate[0] || 1920),
-					month: Number(fdate[1] || 1),
-					day: Number(fdate[2] || 1)
-				}
-			},
-			openDisAbled: function(year, month, day) {
-				let bool = true;
-				let date = `${year}/${month}/${day}`;
-				// let today = this.today.replace(/\-/g, '/');
-				let min = `${this.min.year}/${this.min.month}/${this.min.day}`;
-				let max = `${this.max.year}/${this.max.month}/${this.max.day}`;
-				let timestamp = new Date(date).getTime();
-				if (timestamp >= new Date(min).getTime() && timestamp <= new Date(max).getTime()) {
-					bool = false;
-				}
-				return bool;
-			},
-			generateArray: function(start, end) {
-				return Array.from(new Array(end + 1).keys()).slice(start);
-			},
-			formatNum: function(num) {
-				return num < 10 ? '0' + num : num + '';
-			},
-			//一个月有多少天
-			getMonthDay(year, month) {
-				let days = new Date(year, month, 0).getDate();
-				return days;
-			},
-			getWeekday(year, month) {
-				let date = new Date(`${year}/${month}/01 00:00:00`);
-				return date.getDay();
-			},
-			checkRange(year) {
-				let overstep = false;
-				if (year < this.minYear || year > this.maxYear) {
-					uni.showToast({
-						title: "日期超出范围啦~",
-						icon: 'none'
-					})
-					overstep = true;
-				}
-				return overstep;
-			},
-			changeMonthHandler(isAdd) {
-				if (isAdd) {
-					let month = this.month + 1;
-					let year = month > 12 ? this.year + 1 : this.year;
-					if (!this.checkRange(year)) {
-						this.month = month > 12 ? 1 : month;
-						this.year = year;
-						this.changeData();
-					}
-
-				} else {
-					let month = this.month - 1;
-					let year = month < 1 ? this.year - 1 : this.year;
-					if (!this.checkRange(year)) {
-						this.month = month < 1 ? 12 : month;
-						this.year = year;
-						this.changeData();
-					}
-				}
-			},
-			changeYearHandler(isAdd) {
-				let year = isAdd ? this.year + 1 : this.year - 1;
-				if (!this.checkRange(year)) {
-					this.year = year;
-					this.changeData();
-				}
-			},
-			changeData() {
-				this.days = this.getMonthDay(this.year, this.month);
-				this.daysArr=this.generateArray(1,this.days)
-				this.weekday = this.getWeekday(this.year, this.month);
-				this.weekdayArr=this.generateArray(1,this.weekday)
-				this.showTitle = `${this.year}年${this.month}月`;
-				if (this.isChange && this.mode == 'date') {
-					this.btnFix(true);
-				}
-			},
-			dateClick: function(day) {
-				day += 1;
-				if (!this.openDisAbled(this.year, this.month, day)) {
-					this.day = day;
-					let date = `${this.year}-${this.month}-${day}`;
-					// console.log(date);
-					if (this.mode == 'date') {
-						this.activeDate = date;
-						this.$emit('clicktime',date)
-					} else {
-						let compare = new Date(date.replace(/\-/g, '/')).getTime() < new Date(this.startDate.replace(/\-/g, '/')).getTime()
-						if (this.isStart || compare) {
-							this.startDate = date;
-							this.startYear = this.year;
-							this.startMonth = this.month;
-							this.startDay = this.day;
-							this.endYear = 0;
-							this.endMonth = 0;
-							this.endDay = 0;
-							this.endDate = "";
-							this.activeDate = "";
-							this.isStart = false;
-						} else {
-							this.endDate = date;
-							this.endYear = this.year;
-							this.endMonth = this.month;
-							this.endDay = this.day;
-							this.isStart = true;
-						}
-					}
-				}
-			},
-			close() {
-				// 修改通过v-model绑定的父组件变量的值为false，从而隐藏日历弹窗
-				this.$emit('input', false);
-			},
-			getWeekText(date) {
-				date = new Date(`${date.replace(/\-/g, '/')} 00:00:00`);
-				let week = date.getDay();
-				return '星期' + ['日', '一', '二', '三', '四', '五', '六'][week];
-			},
-			btnFix(show) {
-				if (!show) {
-					this.close();
-				}
-				if (this.mode == 'date') {
-					let arr = this.activeDate.split('-')
-					let year = this.isChange ? this.year : Number(arr[0]);
-					let month = this.isChange ? this.month : Number(arr[1]);
-					let day = this.isChange ? this.day : Number(arr[2]);
-					//当前月有多少天
-					let days = this.getMonthDay(year, month);
-					let result = `${year}-${this.formatNum(month)}-${this.formatNum(day)}`;
-					let weekText = this.getWeekText(result);
-					let isToday = false;
-					if (`${year}-${month}-${day}` == this.today) {
-						//今天
-						isToday = true;
-					}
-					this.$emit('change', {
-						year: year,
-						month: month,
-						day: day,
-						days: days,
-						result: result,
-						week: weekText,
-						isToday: isToday,
-						// switch: show //是否是切换年月操作
-					});
-				} else {
-					if (!this.startDate || !this.endDate) return;
-					let startMonth = this.formatNum(this.startMonth);
-					let startDay = this.formatNum(this.startDay);
-					let startDate = `${this.startYear}-${startMonth}-${startDay}`;
-					let startWeek = this.getWeekText(startDate)
-
-					let endMonth = this.formatNum(this.endMonth);
-					let endDay = this.formatNum(this.endDay);
-					let endDate = `${this.endYear}-${endMonth}-${endDay}`;
-					let endWeek = this.getWeekText(endDate);
-					this.$emit('change', {
-						startYear: this.startYear,
-						startMonth: this.startMonth,
-						startDay: this.startDay,
-						startDate: startDate,
-						startWeek: startWeek,
-						endYear: this.endYear,
-						endMonth: this.endMonth,
-						endDay: this.endDay,
-						endDate: endDate,
-						endWeek: endWeek
-					});
-				}
-			}
-		}
-	};
-</script>
-
-<style scoped lang="scss">
-	@import "../../libs/css/style.components.scss";
-	
-	.u-calendar {
-		color: $u-content-color;
-		
-		&__header {
-			width: 100%;
-			box-sizing: border-box;
-			font-size: 30rpx;
-			background-color: #fff;
-			color: $u-main-color;
-			
-			&__text {
-				margin-top: 30rpx;
-				padding: 0 60rpx;
-				@include vue-flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-		
-		&__action {
-			padding: 40rpx 0 40rpx 0;
-			
-			&__icon {
-				margin: 0 16rpx;
-			}
-			
-			&__text {
-				padding: 0 16rpx;
-				color: $u-main-color;
-				font-size: 32rpx;
-				line-height: 32rpx;
-				font-weight: bold;
-			}
-		}
-	
-		&__week-day {
-			@include vue-flex;
-			align-items: center;
-			justify-content: center;
-			padding: 6px 0;
-			overflow: hidden;
-			
-			&__text {
-				flex: 1;
-				text-align: center;
-			}
-		}
-	
-		&__content {
-			width: 100%;
-			@include vue-flex;
-			flex-wrap: wrap;
-			padding: 6px 0;
-			box-sizing: border-box;
-			background-color: #fff;
-			position: relative;
-			
-			&--end-date {
-				border-top-right-radius: 8rpx;
-				border-bottom-right-radius: 8rpx;
-			}
-			
-			&--start-date {
-				border-top-left-radius: 8rpx;
-				border-bottom-left-radius: 8rpx;
-			}
-			
-			&__item {
-				width: 14.2857%;
-				@include vue-flex;
-				align-items: center;
-				justify-content: center;
-				padding: 6px 0;
-				overflow: hidden;
-				position: relative;
-				z-index: 2;
-				
-				&__inner {
-					height: 84rpx;
-					@include vue-flex;
-					align-items: center;
-					justify-content: center;
-					flex-direction: column;
-					font-size: 32rpx;
-					position: relative;
-					border-radius: 50%;
-					
-					&__desc {
-						width: 100%;
-						font-size: 24rpx;
-						line-height: 24rpx;
-						transform: scale(0.75);
-						transform-origin: center center;
-						position: absolute;
-						left: 0;
-						text-align: center;
-						bottom: 2rpx;
-					}
-				}
-				
-				&__tips {
-					width: 100%;
-					font-size: 24rpx;
-					line-height: 24rpx;
-					position: absolute;
-					left: 0;
-					transform: scale(0.8);
-					transform-origin: center center;
-					text-align: center;
-					bottom: 8rpx;
-					z-index: 2;
-				}
-			}
-			
-			&__bg-month {
-				position: absolute;
-				font-size: 130px;
-				line-height: 130px;
-				left: 50%;
-				top: 50%;
-				transform: translate(-50%, -50%);
-				color: #e4e7ed;
-				z-index: 1;
-			}
-		}
-	
-		&__bottom {
-			width: 100%;
-			@include vue-flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-			background-color: #fff;
-			padding: 0 40rpx 30rpx;
-			box-sizing: border-box;
-			font-size: 24rpx;
-			color: $u-tips-color;
-			
-			&__choose {
-				height: 50rpx;
-			}
-			
-			&__btn {
-				width: 100%;
-			}
-		}
-	}
-</style>
+<template>
+	<u-popup closeable :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto"
+	 :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex" :border-radius="borderRadius" :closeable="closeable">
+		<view class="u-calendar">
+			<view class="u-calendar__header">
+				<view class="u-calendar__header__text" v-if="!$slots['tooltip']">
+					{{toolTip}}
+				</view>
+				<slot v-else name="tooltip" />
+			</view>
+			<view class="u-calendar__action u-flex u-row-center">
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeYear" name="arrow-left-double" :color="yearArrowColor" @click="changeYearHandler(0)"></u-icon>
+				</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeMonth" name="arrow-left" :color="monthArrowColor" @click="changeMonthHandler(0)"></u-icon>
+				</view>
+				<view class="u-calendar__action__text">{{ showTitle }}</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeMonth" name="arrow-right" :color="monthArrowColor" @click="changeMonthHandler(1)"></u-icon>
+				</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeYear" name="arrow-right-double" :color="yearArrowColor" @click="changeYearHandler(1)"></u-icon>
+				</view>
+			</view>
+			<view class="u-calendar__week-day">
+				<view class="u-calendar__week-day__text" v-for="(item, index) in weekDayZh" :key="index">{{item}}</view>
+			</view>
+			<view class="u-calendar__content">
+				<!-- 前置空白部分 -->
+				<block v-for="(item, index) in weekdayArr" :key="index">
+					<view class="u-calendar__content__item"></view>
+				</block>
+				<view class="u-calendar__content__item" :class="{
+					'u-hover-class':openDisAbled(year,month,index+1),
+					'u-calendar__content--start-date': (mode == 'range' && startDate==`${year}-${month}-${index+1}`) || mode== 'date',
+					'u-calendar__content--end-date':(mode== 'range' && endDate==`${year}-${month}-${index+1}`) || mode == 'date'
+				}" :style="{backgroundColor: getColor(index,1)}" v-for="(item, index) in daysArr" :key="index"
+				 @tap="dateClick(index)">
+					<view class="u-calendar__content__item__inner" :style="{color: getColor(index,2)}">
+						<view>{{ index + 1 }}</view>
+					</view>
+					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && startDate==`${year}-${month}-${index+1}` && startDate!=endDate">{{startText}}</view>
+					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && endDate==`${year}-${month}-${index+1}`">{{endText}}</view>
+				</view>
+				<view class="u-calendar__content__bg-month">{{month}}</view>
+			</view>
+			<view class="u-calendar__bottom">
+				<view class="u-calendar__bottom__choose">
+					<text>{{mode == 'date' ? activeDate : startDate}}</text>
+					<text v-if="endDate">至{{endDate}}</text>
+				</view>
+				<view class="u-calendar__bottom__btn">
+					<u-button :type="btnType" shape="circle" :custom-style="{background:'#00a3a0',color:'#fff'}" size="default" @click="btnFix(false)">清除</u-button>
+				</view>
+			</view>
+		</view>
+	</u-popup>
+</template>
+<script>
+	/**
+	 * calendar 日历
+	 * @description 此组件用于单个选择日期，范围选择日期等，日历被包裹在底部弹起的容器中。
+	 * @tutorial http://uviewui.com/components/calendar.html
+	 * @property {String} mode 选择日期的模式，date-为单个日期，range-为选择日期范围
+	 * @property {Boolean} v-model 布尔值变量，用于控制日历的弹出与收起
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
+	 * @property {Boolean} change-year 是否显示顶部的切换年份方向的按钮(默认true)
+	 * @property {Boolean} change-month 是否显示顶部的切换月份方向的按钮(默认true)
+	 * @property {String Number} max-year 可切换的最大年份(默认2050)
+	 * @property {String Number} min-year 可切换的最小年份(默认1950)
+	 * @property {String Number} min-date 最小可选日期(默认1950-01-01)
+	 * @property {String Number} max-date 最大可选日期(默认当前日期)
+	 * @property {String Number} 弹窗顶部左右两边的圆角值，单位rpx(默认20)
+	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭日历(默认true)
+	 * @property {String} month-arrow-color 月份切换按钮箭头颜色(默认#606266)
+	 * @property {String} year-arrow-color 年份切换按钮箭头颜色(默认#909399)
+	 * @property {String} color 日期字体的默认颜色(默认#303133)
+	 * @property {String} active-bg-color 起始/结束日期按钮的背景色(默认#2979ff)
+	 * @property {String Number} z-index 弹出时的z-index值(默认10075)
+	 * @property {String} active-color 起始/结束日期按钮的字体颜色(默认#ffffff)
+	 * @property {String} range-bg-color 起始/结束日期之间的区域的背景颜色(默认rgba(41,121,255,0.13))
+	 * @property {String} range-color 选择范围内字体颜色(默认#2979ff)
+	 * @property {String} start-text 起始日期底部的提示文字(默认 '开始')
+	 * @property {String} end-text 结束日期底部的提示文字(默认 '结束')
+	 * @property {String} btn-type 底部确定按钮的主题(默认 'primary')
+	 * @property {String} toolTip 顶部提示文字，如设置名为tooltip的slot，此参数将失效(默认 '选择日期')
+	 * @property {Boolean} closeable 是否显示右上角的关闭图标(默认true)
+	 * @example <u-calendar v-model="show" :mode="mode"></u-calendar>
+	 */
+	
+	export default {
+		name: 'u-calendar',
+		props: {
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 是否允许通过点击遮罩关闭Picker
+			maskCloseAble: {
+				type: Boolean,
+				default: true
+			},
+			// 通过双向绑定控制组件的弹出与收起
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 弹出的z-index值
+			zIndex: {
+				type: [String, Number],
+				default: 0
+			},
+			// 是否允许切换年份
+			changeYear: {
+				type: Boolean,
+				default: true
+			},
+			// 是否允许切换月份
+			changeMonth: {
+				type: Boolean,
+				default: true
+			},
+			// date-单个日期选择，range-开始日期+结束日期选择
+			mode: {
+				type: String,
+				default: 'date'
+			},
+			// 可切换的最大年份
+			maxYear: {
+				type: [Number, String],
+				default: 2050
+			},
+			// 可切换的最小年份
+			minYear: {
+				type: [Number, String],
+				default: 1950
+			},
+			// 最小可选日期(不在范围内日期禁用不可选)
+			minDate: {
+				type: [Number, String],
+				default: '1950-01-01'
+			},
+			/**
+			 * 最大可选日期
+			 * 默认最大值为今天，之后的日期不可选
+			 * 2030-12-31
+			 * */
+			maxDate: {
+				type: [Number, String],
+				default: ''
+			},
+			// 弹窗顶部左右两边的圆角值
+			borderRadius: {
+				type: [String, Number],
+				default: 20
+			},
+			// 月份切换按钮箭头颜色
+			monthArrowColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 年份切换按钮箭头颜色
+			yearArrowColor: {
+				type: String,
+				default: '#909399'
+			},
+			// 默认日期字体颜色
+			color: {
+				type: String,
+				default: '#303133'
+			},
+			// 选中|起始结束日期背景色
+			activeBgColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 选中|起始结束日期字体颜色
+			activeColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 范围内日期背景色
+			rangeBgColor: {
+				type: String,
+				default: 'rgba(41,121,255,0.13)'
+			}, 
+			// 范围内日期字体颜色
+			rangeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// mode=range时生效，起始日期自定义文案
+			startText: {
+				type: String,
+				default: '开始'
+			},
+			// mode=range时生效，结束日期自定义文案
+			endText: {
+				type: String,
+				default: '结束'
+			},
+			//按钮样式类型
+			btnType: {
+				type: String,
+				default: 'primary'
+			},
+			// 当前选中日期带选中效果
+			isActiveCurrent: {
+				type: Boolean,
+				default: true
+			},
+			// 切换年月是否触发事件 mode=date时生效
+			isChange: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示右上角的关闭图标
+			closeable: {
+				type: Boolean,
+				default: true
+			},
+			// 顶部的提示文字
+			toolTip: {
+				type: String,
+				default: '选择日期'
+			}
+		},
+		data() {
+			return {
+				// 星期几,值为1-7
+				weekday: 1, 
+				weekdayArr:[],
+				// 当前月有多少天
+				days: 0, 
+				daysArr:[],
+				showTitle: '',
+				year: 2020,
+				month: 0,
+				day: 0,
+				startYear: 0,
+				startMonth: 0,
+				startDay: 0,
+				endYear: 0,
+				endMonth: 0,
+				endDay: 0,
+				today: '',
+				activeDate: '',
+				startDate: '',
+				endDate: '',
+				isStart: true,
+				min: null,
+				max: null,
+				weekDayZh: ['日', '一', '二', '三', '四', '五', '六']
+			};
+		},
+		computed: {
+			dataChange() {
+				return `${this.mode}-${this.minDate}-${this.maxDate}`;
+			},
+			uZIndex() {
+				// 如果用户有传递z-index值，优先使用
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		watch: {
+			dataChange(val) {
+				this.init()
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			getColor(index, type) {
+				let color = type == 1 ? '' : this.color;
+				let day = index + 1
+				let date = `${this.year}-${this.month}-${day}`
+				let timestamp = new Date(date.replace(/\-/g, '/')).getTime();
+				let start = this.startDate.replace(/\-/g, '/')
+				let end = this.endDate.replace(/\-/g, '/')
+				if ((this.isActiveCurrent && this.activeDate == date) || this.startDate == date || this.endDate == date) {
+					color = type == 1 ? this.activeBgColor : this.activeColor;
+				} else if (this.endDate && timestamp > new Date(start).getTime() && timestamp < new Date(end).getTime()) {
+					color = type == 1 ? this.rangeBgColor : this.rangeColor;
+				}
+				return color;
+			},
+			init() {
+				let now = new Date();
+				this.year = now.getFullYear();
+				this.month = now.getMonth() + 1;
+				this.day = now.getDate();
+				this.today = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
+				this.activeDate = this.today;
+				this.min = this.initDate(this.minDate);
+				this.max = this.initDate(this.maxDate || this.today);
+				this.startDate = "";
+				this.startYear = 0;
+				this.startMonth = 0;
+				this.startDay = 0;
+				this.endYear = 0;
+				this.endMonth = 0;
+				this.endDay = 0;
+				this.endDate = "";
+				this.isStart = true;
+				this.changeData();
+			},
+			//日期处理
+			initDate(date) {
+				let fdate = date.split('-');
+				return {
+					year: Number(fdate[0] || 1920),
+					month: Number(fdate[1] || 1),
+					day: Number(fdate[2] || 1)
+				}
+			},
+			openDisAbled: function(year, month, day) {
+				let bool = true;
+				let date = `${year}/${month}/${day}`;
+				// let today = this.today.replace(/\-/g, '/');
+				let min = `${this.min.year}/${this.min.month}/${this.min.day}`;
+				let max = `${this.max.year}/${this.max.month}/${this.max.day}`;
+				let timestamp = new Date(date).getTime();
+				if (timestamp >= new Date(min).getTime() && timestamp <= new Date(max).getTime()) {
+					bool = false;
+				}
+				return bool;
+			},
+			generateArray: function(start, end) {
+				return Array.from(new Array(end + 1).keys()).slice(start);
+			},
+			formatNum: function(num) {
+				return num < 10 ? '0' + num : num + '';
+			},
+			//一个月有多少天
+			getMonthDay(year, month) {
+				let days = new Date(year, month, 0).getDate();
+				return days;
+			},
+			getWeekday(year, month) {
+				let date = new Date(`${year}/${month}/01 00:00:00`);
+				return date.getDay();
+			},
+			checkRange(year) {
+				let overstep = false;
+				if (year < this.minYear || year > this.maxYear) {
+					uni.showToast({
+						title: "日期超出范围啦~",
+						icon: 'none'
+					})
+					overstep = true;
+				}
+				return overstep;
+			},
+			changeMonthHandler(isAdd) {
+				if (isAdd) {
+					let month = this.month + 1;
+					let year = month > 12 ? this.year + 1 : this.year;
+					if (!this.checkRange(year)) {
+						this.month = month > 12 ? 1 : month;
+						this.year = year;
+						this.changeData();
+					}
+
+				} else {
+					let month = this.month - 1;
+					let year = month < 1 ? this.year - 1 : this.year;
+					if (!this.checkRange(year)) {
+						this.month = month < 1 ? 12 : month;
+						this.year = year;
+						this.changeData();
+					}
+				}
+			},
+			changeYearHandler(isAdd) {
+				let year = isAdd ? this.year + 1 : this.year - 1;
+				if (!this.checkRange(year)) {
+					this.year = year;
+					this.changeData();
+				}
+			},
+			changeData() {
+				this.days = this.getMonthDay(this.year, this.month);
+				this.daysArr=this.generateArray(1,this.days)
+				this.weekday = this.getWeekday(this.year, this.month);
+				this.weekdayArr=this.generateArray(1,this.weekday)
+				this.showTitle = `${this.year}年${this.month}月`;
+				if (this.isChange && this.mode == 'date') {
+					this.btnFix(true);
+				}
+			},
+			dateClick: function(day) {
+				day += 1;
+				if (!this.openDisAbled(this.year, this.month, day)) {
+					this.day = day;
+					let date = `${this.year}-${this.month}-${day}`;
+					// console.log(date);
+					if (this.mode == 'date') {
+						this.activeDate = date;
+						this.$emit('clicktime',date)
+					} else {
+						let compare = new Date(date.replace(/\-/g, '/')).getTime() < new Date(this.startDate.replace(/\-/g, '/')).getTime()
+						if (this.isStart || compare) {
+							this.startDate = date;
+							this.startYear = this.year;
+							this.startMonth = this.month;
+							this.startDay = this.day;
+							this.endYear = 0;
+							this.endMonth = 0;
+							this.endDay = 0;
+							this.endDate = "";
+							this.activeDate = "";
+							this.isStart = false;
+						} else {
+							this.endDate = date;
+							this.endYear = this.year;
+							this.endMonth = this.month;
+							this.endDay = this.day;
+							this.isStart = true;
+						}
+					}
+				}
+			},
+			close() {
+				// 修改通过v-model绑定的父组件变量的值为false，从而隐藏日历弹窗
+				this.$emit('input', false);
+			},
+			getWeekText(date) {
+				date = new Date(`${date.replace(/\-/g, '/')} 00:00:00`);
+				let week = date.getDay();
+				return '星期' + ['日', '一', '二', '三', '四', '五', '六'][week];
+			},
+			btnFix(show) {
+				if (!show) {
+					this.close();
+				}
+				if (this.mode == 'date') {
+					let arr = this.activeDate.split('-')
+					let year = this.isChange ? this.year : Number(arr[0]);
+					let month = this.isChange ? this.month : Number(arr[1]);
+					let day = this.isChange ? this.day : Number(arr[2]);
+					//当前月有多少天
+					let days = this.getMonthDay(year, month);
+					let result = `${year}-${this.formatNum(month)}-${this.formatNum(day)}`;
+					let weekText = this.getWeekText(result);
+					let isToday = false;
+					if (`${year}-${month}-${day}` == this.today) {
+						//今天
+						isToday = true;
+					}
+					this.$emit('change', {
+						year: year,
+						month: month,
+						day: day,
+						days: days,
+						result: result,
+						week: weekText,
+						isToday: isToday,
+						// switch: show //是否是切换年月操作
+					});
+				} else {
+					if (!this.startDate || !this.endDate) return;
+					let startMonth = this.formatNum(this.startMonth);
+					let startDay = this.formatNum(this.startDay);
+					let startDate = `${this.startYear}-${startMonth}-${startDay}`;
+					let startWeek = this.getWeekText(startDate)
+
+					let endMonth = this.formatNum(this.endMonth);
+					let endDay = this.formatNum(this.endDay);
+					let endDate = `${this.endYear}-${endMonth}-${endDay}`;
+					let endWeek = this.getWeekText(endDate);
+					this.$emit('change', {
+						startYear: this.startYear,
+						startMonth: this.startMonth,
+						startDay: this.startDay,
+						startDate: startDate,
+						startWeek: startWeek,
+						endYear: this.endYear,
+						endMonth: this.endMonth,
+						endDay: this.endDay,
+						endDate: endDate,
+						endWeek: endWeek
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-calendar {
+		color: $u-content-color;
+		
+		&__header {
+			width: 100%;
+			box-sizing: border-box;
+			font-size: 30rpx;
+			background-color: #fff;
+			color: $u-main-color;
+			
+			&__text {
+				margin-top: 30rpx;
+				padding: 0 60rpx;
+				@include vue-flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+		
+		&__action {
+			padding: 40rpx 0 40rpx 0;
+			
+			&__icon {
+				margin: 0 16rpx;
+			}
+			
+			&__text {
+				padding: 0 16rpx;
+				color: $u-main-color;
+				font-size: 32rpx;
+				line-height: 32rpx;
+				font-weight: bold;
+			}
+		}
+	
+		&__week-day {
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			padding: 6px 0;
+			overflow: hidden;
+			
+			&__text {
+				flex: 1;
+				text-align: center;
+			}
+		}
+	
+		&__content {
+			width: 100%;
+			@include vue-flex;
+			flex-wrap: wrap;
+			padding: 6px 0;
+			box-sizing: border-box;
+			background-color: #fff;
+			position: relative;
+			
+			&--end-date {
+				border-top-right-radius: 8rpx;
+				border-bottom-right-radius: 8rpx;
+			}
+			
+			&--start-date {
+				border-top-left-radius: 8rpx;
+				border-bottom-left-radius: 8rpx;
+			}
+			
+			&__item {
+				width: 14.2857%;
+				@include vue-flex;
+				align-items: center;
+				justify-content: center;
+				padding: 6px 0;
+				overflow: hidden;
+				position: relative;
+				z-index: 2;
+				
+				&__inner {
+					height: 84rpx;
+					@include vue-flex;
+					align-items: center;
+					justify-content: center;
+					flex-direction: column;
+					font-size: 32rpx;
+					position: relative;
+					border-radius: 50%;
+					
+					&__desc {
+						width: 100%;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						transform: scale(0.75);
+						transform-origin: center center;
+						position: absolute;
+						left: 0;
+						text-align: center;
+						bottom: 2rpx;
+					}
+				}
+				
+				&__tips {
+					width: 100%;
+					font-size: 24rpx;
+					line-height: 24rpx;
+					position: absolute;
+					left: 0;
+					transform: scale(0.8);
+					transform-origin: center center;
+					text-align: center;
+					bottom: 8rpx;
+					z-index: 2;
+				}
+			}
+			
+			&__bg-month {
+				position: absolute;
+				font-size: 130px;
+				line-height: 130px;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%, -50%);
+				color: #e4e7ed;
+				z-index: 1;
+			}
+		}
+	
+		&__bottom {
+			width: 100%;
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #fff;
+			padding: 0 40rpx 30rpx;
+			box-sizing: border-box;
+			font-size: 24rpx;
+			color: $u-tips-color;
+			
+			&__choose {
+				height: 50rpx;
+			}
+			
+			&__btn {
+				width: 100%;
+			}
+		}
+	}
+</style>

uview-ui/components/u-car-keyboard/u-car-keyboard.vue

@@ -1,257 +1,257 @@
-<template>
-	<view class="u-keyboard" @touchmove.stop.prevent="() => {}">
-		<view class="u-keyboard-grids">
-			<block>
-				<view class="u-keyboard-grids-item" v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
-					<view :hover-stay-time="100" @tap="carInputClick(i, j)" hover-class="u-carinput-hover" class="u-keyboard-grids-btn"
-					 v-for="(item, j) in group" :key="j">
-						{{ item }}
-					</view>
-				</view>
-				<view @touchstart="backspaceClick" @touchend="clearTimer" :hover-stay-time="100" class="u-keyboard-back"
-				 hover-class="u-hover-class">
-					<u-icon :size="38" name="backspace" :bold="true"></u-icon>
-				</view>
-				<view :hover-stay-time="100" class="u-keyboard-change" hover-class="u-carinput-hover" @tap="changeCarInputMode">
-					<text class="zh" :class="[!abc ? 'active' : 'inactive']">中</text>
-					/
-					<text class="en" :class="[abc ? 'active' : 'inactive']">英</text>
-				</view>
-			</block>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "u-keyboard",
-		props: {
-			// 是�打乱键盘按键的顺�
-			random: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				// 车牌输入时，abc=true为输入车牌��，bac=false为输入�份中文简称
-				abc: false
-			};
-		},
-		computed: {
-			areaList() {
-				let data = [
-					'京',
-					'沪',
-					'粤',
-					'æ´¥',
-					'冀',
-					'豫',
-					'云',
-					'è¾½',
-					'黑',
-					'湘',
-					'çš–',
-					'�',
-					'�',
-					'æµ™',
-					'èµ£',
-					'é„‚',
-					'æ¡‚',
-					'甘',
-					'晋',
-					'陕',
-					'è’™',
-					'�',
-					'é—½',
-					'è´µ',
-					'�',
-					'å·�',
-					'�',
-					'�',
-					'�',
-					'挂',
-					'è—�',
-					'港',
-					'æ¾³',
-					'æ–°',
-					'使',
-					'å­¦'
-				];
-				let tmp = [];
-				// 打乱顺�
-				if (this.random) data = this.$u.randomArray(data);
-				// 切割�二维数组
-				tmp[0] = data.slice(0, 10);
-				tmp[1] = data.slice(10, 20);
-				tmp[2] = data.slice(20, 30);
-				tmp[3] = data.slice(30, 36);
-				return tmp;
-			},
-			EngKeyBoardList() {
-				let data = [
-					1,
-					2,
-					3,
-					4,
-					5,
-					6,
-					7,
-					8,
-					9,
-					0,
-					'Q',
-					'W',
-					'E',
-					'R',
-					'T',
-					'Y',
-					'U',
-					'I',
-					'O',
-					'P',
-					'A',
-					'S',
-					'D',
-					'F',
-					'G',
-					'H',
-					'J',
-					'K',
-					'L',
-					'Z',
-					'X',
-					'C',
-					'V',
-					'B',
-					'N',
-					'M'
-				];
-				let tmp = [];
-				if (this.random) data = this.$u.randomArray(data);
-				tmp[0] = data.slice(0, 10);
-				tmp[1] = data.slice(10, 20);
-				tmp[2] = data.slice(20, 30);
-				tmp[3] = data.slice(30, 36);
-				return tmp;
-			}
-		},
-		methods: {
-			// 点击键盘按钮
-			carInputClick(i, j) {
-				let value = '';
-				// ��模�，获���数组的值
-				if (this.abc) value = this.EngKeyBoardList[i][j];
-				else value = this.areaList[i][j];
-				this.$emit('change', value);
-			},
-			// 修改汽车牌键盘的输入模�，中文|英文
-			changeCarInputMode() {
-				this.abc = !this.abc;
-			},
-			// 点击退格键
-			backspaceClick() {
-				this.$emit('backspace');
-				clearInterval(this.timer); //�次清空定时器，防止��注册定时器
-				this.timer = null;
-				this.timer = setInterval(() => {
-					this.$emit('backspace');
-				}, 250);
-			},
-			clearTimer() {
-				clearInterval(this.timer);
-				this.timer = null;
-			},
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	@import "../../libs/css/style.components.scss";
-
-	.u-keyboard-grids {
-		background: rgb(215, 215, 217);
-		padding: 24rpx 0;
-		position: relative;
-	}
-
-	.u-keyboard-grids-item {
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.u-keyboard-grids-btn {
-		text-decoration: none;
-		width: 62rpx;
-		flex: 0 0 64rpx;
-		height: 80rpx;
-		/* #ifndef APP-NVUE */
-		display: inline-flex;		
-		/* #endif */
-		font-size: 36rpx;
-		text-align: center;
-		line-height: 80rpx;
-		background-color: #fff;
-		margin: 8rpx 5rpx;
-		border-radius: 8rpx;
-		box-shadow: 0 2rpx 0rpx #888992;
-		font-weight: 500;
-		justify-content: center;
-	}
-
-	.u-carinput-hover {
-		background-color: rgb(185, 188, 195) !important;
-	}
-
-	.u-keyboard-back {
-		position: absolute;
-		width: 96rpx;
-		right: 22rpx;
-		bottom: 32rpx;
-		height: 80rpx;
-		background-color: rgb(185, 188, 195);
-		@include vue-flex;
-		align-items: center;
-		border-radius: 8rpx;
-		justify-content: center;
-		box-shadow: 0 2rpx 0rpx #888992;
-	}
-
-	.u-keyboard-change {
-		font-size: 24rpx;
-		box-shadow: 0 2rpx 0rpx #888992;
-		position: absolute;
-		width: 96rpx;
-		left: 22rpx;
-		line-height: 1;
-		bottom: 32rpx;
-		height: 80rpx;
-		background-color: #ffffff;
-		@include vue-flex;
-		align-items: center;
-		border-radius: 8rpx;
-		justify-content: center;
-	}
-
-	.u-keyboard-change .inactive.zh {
-		transform: scale(0.85) translateY(-10rpx);
-	}
-
-	.u-keyboard-change .inactive.en {
-		transform: scale(0.85) translateY(10rpx);
-	}
-
-	.u-keyboard-change .active {
-		color: rgb(237, 112, 64);
-		font-size: 30rpx;
-	}
-
-	.u-keyboard-change .zh {
-		transform: translateY(-10rpx);
-	}
-
-	.u-keyboard-change .en {
-		transform: translateY(10rpx);
-	}
-</style>
+<template>
+	<view class="u-keyboard" @touchmove.stop.prevent="() => {}">
+		<view class="u-keyboard-grids">
+			<block>
+				<view class="u-keyboard-grids-item" v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
+					<view :hover-stay-time="100" @tap="carInputClick(i, j)" hover-class="u-carinput-hover" class="u-keyboard-grids-btn"
+					 v-for="(item, j) in group" :key="j">
+						{{ item }}
+					</view>
+				</view>
+				<view @touchstart="backspaceClick" @touchend="clearTimer" :hover-stay-time="100" class="u-keyboard-back"
+				 hover-class="u-hover-class">
+					<u-icon :size="38" name="backspace" :bold="true"></u-icon>
+				</view>
+				<view :hover-stay-time="100" class="u-keyboard-change" hover-class="u-carinput-hover" @tap="changeCarInputMode">
+					<text class="zh" :class="[!abc ? 'active' : 'inactive']">�/text>
+					/
+					<text class="en" :class="[abc ? 'active' : 'inactive']">è‹?/text>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "u-keyboard",
+		props: {
+			// 是�打乱键盘按键的顺�
+			random: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				// 车牌输入时，abc=true为输入车牌��，bac=false为输入�份中文简�
+				abc: false
+			};
+		},
+		computed: {
+			areaList() {
+				let data = [
+					'�,
+					'æ²?,
+					'ç²?,
+					'æ´?,
+					'冀',
+					'è±?,
+					'�,
+					'è¾?,
+					'é»?,
+					'æ¹?,
+					'çš?,
+					'é²?,
+					'è‹?,
+					'æµ?,
+					'èµ?,
+					'é„?,
+					'æ¡?,
+					'ç”?,
+					'æ™?,
+					'é™?,
+					'è’?,
+					'�,
+					'é—?,
+					'è´?,
+					'�,
+					'å·?,
+					'�,
+					'�,
+					'å®?,
+					'�,
+					'è—?,
+					'�,
+					'æ¾?,
+					'æ–?,
+					'ä½?,
+					'å­?
+				];
+				let tmp = [];
+				// 打乱顺�
+				if (this.random) data = this.$u.randomArray(data);
+				// 切割�二维数�
+				tmp[0] = data.slice(0, 10);
+				tmp[1] = data.slice(10, 20);
+				tmp[2] = data.slice(20, 30);
+				tmp[3] = data.slice(30, 36);
+				return tmp;
+			},
+			EngKeyBoardList() {
+				let data = [
+					1,
+					2,
+					3,
+					4,
+					5,
+					6,
+					7,
+					8,
+					9,
+					0,
+					'Q',
+					'W',
+					'E',
+					'R',
+					'T',
+					'Y',
+					'U',
+					'I',
+					'O',
+					'P',
+					'A',
+					'S',
+					'D',
+					'F',
+					'G',
+					'H',
+					'J',
+					'K',
+					'L',
+					'Z',
+					'X',
+					'C',
+					'V',
+					'B',
+					'N',
+					'M'
+				];
+				let tmp = [];
+				if (this.random) data = this.$u.randomArray(data);
+				tmp[0] = data.slice(0, 10);
+				tmp[1] = data.slice(10, 20);
+				tmp[2] = data.slice(20, 30);
+				tmp[3] = data.slice(30, 36);
+				return tmp;
+			}
+		},
+		methods: {
+			// 点击键盘按钮
+			carInputClick(i, j) {
+				let value = '';
+				// ��模�，获���数组的�
+				if (this.abc) value = this.EngKeyBoardList[i][j];
+				else value = this.areaList[i][j];
+				this.$emit('change', value);
+			},
+			// 修改汽车牌键盘的输入模�，中文|英文
+			changeCarInputMode() {
+				this.abc = !this.abc;
+			},
+			// 点击退格键
+			backspaceClick() {
+				this.$emit('backspace');
+				clearInterval(this.timer); //�次清空定时器，防止��注册定时�
+				this.timer = null;
+				this.timer = setInterval(() => {
+					this.$emit('backspace');
+				}, 250);
+			},
+			clearTimer() {
+				clearInterval(this.timer);
+				this.timer = null;
+			},
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-keyboard-grids {
+		background: rgb(215, 215, 217);
+		padding: 24rpx 0;
+		position: relative;
+	}
+
+	.u-keyboard-grids-item {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.u-keyboard-grids-btn {
+		text-decoration: none;
+		width: 62rpx;
+		flex: 0 0 64rpx;
+		height: 80rpx;
+		/* #ifndef APP-NVUE */
+		display: inline-flex;		
+		/* #endif */
+		font-size: 36rpx;
+		text-align: center;
+		line-height: 80rpx;
+		background-color: #fff;
+		margin: 8rpx 5rpx;
+		border-radius: 8rpx;
+		box-shadow: 0 2rpx 0rpx #888992;
+		font-weight: 500;
+		justify-content: center;
+	}
+
+	.u-carinput-hover {
+		background-color: rgb(185, 188, 195) !important;
+	}
+
+	.u-keyboard-back {
+		position: absolute;
+		width: 96rpx;
+		right: 22rpx;
+		bottom: 32rpx;
+		height: 80rpx;
+		background-color: rgb(185, 188, 195);
+		@include vue-flex;
+		align-items: center;
+		border-radius: 8rpx;
+		justify-content: center;
+		box-shadow: 0 2rpx 0rpx #888992;
+	}
+
+	.u-keyboard-change {
+		font-size: 24rpx;
+		box-shadow: 0 2rpx 0rpx #888992;
+		position: absolute;
+		width: 96rpx;
+		left: 22rpx;
+		line-height: 1;
+		bottom: 32rpx;
+		height: 80rpx;
+		background-color: #ffffff;
+		@include vue-flex;
+		align-items: center;
+		border-radius: 8rpx;
+		justify-content: center;
+	}
+
+	.u-keyboard-change .inactive.zh {
+		transform: scale(0.85) translateY(-10rpx);
+	}
+
+	.u-keyboard-change .inactive.en {
+		transform: scale(0.85) translateY(10rpx);
+	}
+
+	.u-keyboard-change .active {
+		color: rgb(255, 0, 0);
+		font-size: 30rpx;
+	}
+
+	.u-keyboard-change .zh {
+		transform: translateY(-10rpx);
+	}
+
+	.u-keyboard-change .en {
+		transform: translateY(10rpx);
+	}
+</style>

uview-ui/components/u-row-notice/u-row-notice.vue

@@ -103,11 +103,11 @@
 			padding: {
 				type: [Number, String],
 				default: '18rpx 24rpx'
-			},
-			// 图标颜色
-			iconColor:{
-				type:String,
-				default:'#2AA47F'
+			},
+			// 图标颜色
+			iconColor:{
+				type:String,
+				default:'#00a3a0'
 			}
 		},
 		data() {
@@ -265,4 +265,4 @@
 			transform: translate3d(-100%, 0, 0);
 		}
 	}
-</style>
+</style>