3.9(分包

2024-03-09 14:22:06 +08:00
parent 2be0196ddf
commit 470460844d
31 changed files with 343 additions and 11121 deletions
--- a/api/system/config.js
+++ b/api/system/config.js
@@ -286,3 +286,10 @@ export function getCarDealerList() {
 		'method': 'get',
 	})
 }
+//获取省级联动 api/front/city
+export function getAddress() {
+	return request({
+		'url': '/api/front/city/list/tree',
+		'method': 'get',
+	})
+}
--- a/components/area-picker/area-picker.vue
+++ b/components/area-picker/area-picker.vue
@@ -6,20 +6,20 @@
 	  </view>
 	  <picker-view :indicator-style="indicatorStyle" :value="value" @change="bindChange" class="picker-view">
 			<picker-view-column>
-				<view class="item" v-for="(item,index) in provinces" :key="item.code">{{item.name}}</view>
+				<view class="item" v-for="(item,index) in provinces" :key="item.code">{{item.regionName}}</view>
 			</picker-view-column>
 				<picker-view-column>
-					<view class="item" v-for="(item,index) in citys" :key="item.code">{{item.name}}</view>
+					<view class="item" v-for="(item,index) in citys" :key="item.code">{{item.regionName}}</view>
 				</picker-view-column>
 				<picker-view-column>
-					<view class="item" v-for="(item,index) in districts" :key="item.code">{{item.name}}</view>
+					<view class="item" v-for="(item,index) in districts" :key="item.code">{{item.regionName}}</view>
 				</picker-view-column>
 	  </picker-view>
 	</view>
 </template>

 <script>
-	import { data } from '@/data/address'
+	// import address from "@/data/address.js"
 	export default {
 		name:"area-picker",
 		props: {
@@ -45,16 +45,16 @@
 		},
 		mounted() {
 			console.log(this.defaultRegion);
-			this.provinces = data
-			this.citys = data[this.provincesIndex].children
-			this.districts = this.citys[this.citysIndex].children
-			console.log(this.provinces.findIndex(i => i.name == this.defaultRegion[0]));
-			this.provincesIndex = this.provinces.findIndex(i => i.name == this.defaultRegion[0])
-			this.citysIndex = this.provinces[this.provincesIndex].children.findIndex(i => i.name == this.defaultRegion[1])
-			this.districtsIndex = this.provinces[this.provincesIndex].children[this.citysIndex].children.findIndex(i => i.name == this.defaultRegion[2])
-			this.value[0] = this.provinces.findIndex(i => i.name == this.defaultRegion[0])
-			this.value[1] = this.provinces[this.provincesIndex].children.findIndex(i => i.name == this.defaultRegion[1])
-			this.value[2] = this.provinces[this.provincesIndex].children[this.citysIndex].children.findIndex(i => i.name == this.defaultRegion[2])
+			this.provinces = this.$address.address
+			this.citys = provinces[this.provincesIndex].child
+			this.districts = this.citys[this.citysIndex].child
+			console.log(this.provinces.findIndex(i => i.regionName == this.defaultRegion[0]));
+			this.provincesIndex = this.provinces.findIndex(i => i.regionName == this.defaultRegion[0])
+			this.citysIndex = this.provinces[this.provincesIndex].child.findIndex(i => i.regionName == this.defaultRegion[1])
+			this.districtsIndex = this.provinces[this.provincesIndex].child[this.citysIndex].child.findIndex(i => i.regionName == this.defaultRegion[2])
+			this.value[0] = this.provinces.findIndex(i => i.regionName == this.defaultRegion[0])
+			this.value[1] = this.provinces[this.provincesIndex].child.findIndex(i => i.regionName == this.defaultRegion[1])
+			this.value[2] = this.provinces[this.provincesIndex].child[this.citysIndex].child.findIndex(i => i.regionName == this.defaultRegion[2])
 			console.log(this.value);
 			let timer = setTimeout(() => {
 				this.first = false
@@ -62,8 +62,8 @@
 		},
 		watch: {
 			provincesIndex(nV) {
-				this.citys = data[this.provincesIndex].children
-				this.districts = this.citys[this.citysIndex].children
+				this.citys = data[this.provincesIndex].child
+				this.districts = this.citys[this.citysIndex].child
 				if(!this.first) {
 					this.citysIndex = 0
 					this.districtsIndex = 0
@@ -72,7 +72,7 @@
 				}
 			},
 			citysIndex(nV) {
-				this.districts = this.citys[this.citysIndex].children
+				this.districts = this.citys[this.citysIndex].child
 				if(!this.first) {
 					this.districtsIndex = 0
 					this.value[2] = 0
@@ -82,9 +82,9 @@
 		methods: {
 			submit() {
 				this.$emit('confirm',[
-					this.provinces[this.provincesIndex].name,
-					this.citys[this.citysIndex].name,
-					this.districts[this.districtsIndex].name
+					this.provinces[this.provincesIndex].regionName,
+					this.citys[this.citysIndex].regionName,
+					this.districts[this.districtsIndex].regionName
 				])
 			},
 			cencel() {
--- a/config.js
+++ b/config.js
@@ -6,7 +6,6 @@ module.exports = {
 	TOKENNAME: 'Authori-zation',
 	//薛磊测试
 	// baseUrl: 'http://192.168.31.226:8081/car_app_api',
-	// baseUrl: 'http://192.168.31.15:8081/car_app_api',
 	fileUploadUrl: 'https://mall.lianxianke.cn/car_app_api/api/front/upload/image',
 	WebSocketUrl: 'ws://121.199.24.205:9107/lxk/websocket',
 	WebSocketOpen: false,
@@ -21,7 +20,7 @@ module.exports = {
 		// 应用版本
 		version: "1.1.0",
 		// 应用logo
-		logo: "/static/images/logo/logo.png",
+		logo: "https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/logo.png",
 		// 官方网站
 		site_url: "http://lxk.vip",
 		// 政策协议
--- a/data/address.js
+++ b/data/address.js
--- a/data/menu.js
+++ b/data/menu.js
@@ -13,7 +13,7 @@ export const mineMenu = [{
 }, {
 	id: 4,
 	name: '天天打卡',
-	url: '/pages/mine/every_day_card/every_day_card'
+	url: '/pagesA/every_day_card/every_day_card'
 }, {
 	id: 5,
 	name: '我的钱包',
@@ -21,7 +21,7 @@ export const mineMenu = [{
 }, {
 	id: 6,
 	name: '我的收藏',
-	url: '/pages/mine/my_favorite/my_favorite'
+	url: '/pagesA/my_favorite/my_favorite'
 },
 // {
 // 	id: 7,
--- a/data/tabsData2.js
+++ b/data/tabsData2.js
@@ -34,19 +34,6 @@ export const tabsList2 = [{
 	name: '助力失败',
 	value: 2
 }]
-export const tabsList3 = [{
-	name: '全部',
-	value: -1
-}, {
-	name: '未提车',
-	value: 0
-}, {
-	name: '已完成',
-	value: 1
-}, {
-	name: '已退款',
-	value: 2
-}]
 export const tabsList4 = [{
 	name: '全部',
 	value: -1
@@ -65,96 +52,4 @@ export const tabsList4 = [{
 }, {
 	name: '已退款',
 	value: 4
-}]
-export const tabsList5 = [{
-	name: '工单订单',
-	value: 1
-}, {
-	name: '积分订单',
-	value: 2
-}, {
-	name: '卡券订单',
-	value: 3
-}]
-export const tabsList6 = [{
-	name: '全部',
-	value: -1
-}, {
-	name: '代付款',
-	value: 0
-}, {
-	name: '待使用',
-	value: 1
-}, {
-	name: '已完成',
-	value: 2
-}]
-
-export const tabsListI = [{
-	name: '全部',
-	value: -1
-}, {
-	name: '代付款',
-	value: 0
-}, {
-	name: '已取消',
-	value: 5
-}, {
-	name: '已完成',
-	value: 2
-}]
-
-export const tabsList7 = [{
-	name: '全部',
-	value: 1,
-	type: 'all'
-}, {
-	name: '待受理',
-	value: 2,
-	type: 'ucheck'
-}, {
-	name: '已确认',
-	value: 3,
-	type: 'notArrive'
-}, {
-	name: '已完成',
-	value: 4,
-	type: 'finish'
-}, {
-	name: '已驳回',
-	value: 5,
-	type: 'reject'
-}]
-
-export const indexTabList = [{
-	name: '广场',
-	value: 1,
-	type: 'true'
-}, {
-	name: '关注',
-	value: 3,
-	type: 'true'
-}, {
-	name: '转租',
-	value: 2,
-	type: 'true'
-}, {
-	name: '此地',
-	value: 4,
-	type: 'true'
-}, {
-	name: '咨询',
-	value: 5,
-	type: 'true'
-
-}]
-export const tabsList8 = [{
-	name: '全部卡券',
-	value: 1
-}, {
-	name: '限时优惠',
-	value: 2
-}, {
-	name: '助力抢券',
-	value: 3
 }]
--- a/main.js
+++ b/main.js
@@ -1,30 +1,31 @@
-import Vue from 'vue'
-import App from './App'
-import store from './store' // store
-import plugins from './plugins' // plugins
-import util from 'utils/util'
+import Vue from 'vue'
+import App from './App'
+import store from './store' // store
+import plugins from './plugins' // plugins
+import util from 'utils/util'
 import './permission' // permission
-import uView from '@/uni_modules/uview-ui'
-import ZPMixin from '@/uni_modules/z-paging/components/z-paging/js/z-paging-mixin'
+import uView from '@/uni_modules/uview-ui'
+import ZPMixin from '@/uni_modules/z-paging/components/z-paging/js/z-paging-mixin'
 import {toast, showConfirm} from '@/utils/common.js'
-
+import address from "@/data/address.js"
 import _ from 'lodash';
 Vue.prototype.$ld = _ ;
 Vue.mixin(ZPMixin)
 Vue.use(uView)
-
-Vue.use(plugins)
-
-Vue.config.productionTip = false
-Vue.prototype.$util = util;
-Vue.prototype.$store = store
-Vue.prototype.$toast = toast
-Vue.prototype.$confirm = showConfirm
-
-App.mpType = 'app'
-
-const app = new Vue({
-  ...App
-})
-
+
+Vue.use(plugins)
+
+Vue.config.productionTip = false
+Vue.prototype.$address=address;
+Vue.prototype.$util = util;
+Vue.prototype.$store = store
+Vue.prototype.$toast = toast
+Vue.prototype.$confirm = showConfirm
+
+App.mpType = 'app'
+
+const app = new Vue({
+  ...App
+})
+
 app.$mount()
--- a/pages.json
+++ b/pages.json
@@ -11,20 +11,20 @@
 				"navigationBarTitleText": "登录",
 				"navigationStyle": "custom"
 			}
-		},  {
+		}, {
 			"path": "pages/login/weixin-login",
 			"style": {
 				"navigationBarTitleText": "微信登录",
 				"navigationStyle": "custom"
 			}
-		},{
+		}, {
 			"path": "pages/welfare/invite/invite",
 			"style": {
 				"navigationBarTitleText": "邀请有礼",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-		},{
+		}, {
 			"path": "pages/welfare/invite/invite_poster",
 			"style": {
 				"navigationBarTitleText": "邀请海报",
@@ -45,7 +45,7 @@
 				"navigationBarTitleText": "邀请购买",
 				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/welfare/invite/commission_withdraw",
 			"style": {
 				"navigationBarTitleText": "佣金提现",
@@ -71,50 +71,38 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
-		}, 
+		},
 		{
-			"path" : "pages/showroom/carList/carList",
-			"style" :
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false,
+			"path": "pages/showroom/carList/carList",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/showroom/carRental/index",
-			"style" :
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false,
+			"path": "pages/showroom/carRental/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/showroom/carBuy/index",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
+			"path": "pages/showroom/carBuy/index",
+			"style": {
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/showroom/carBuy/predetermine",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false,
+			"path": "pages/showroom/carBuy/predetermine",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
-				
-			}
-		},
-		{
-			"path" : "pages/showroom/confirmOrder/confirmOrder",
-			"style" : 
-			{
-				"navigationBarTitleText" : "确认订单",
-				"navigationBarBackgroundColor": "#f5f5f5"
+
 			}
 		},
 		{
@@ -122,21 +110,21 @@
 			"style": {
 				"navigationBarTitleText": "服务",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/activity_list",
 			"style": {
 				"navigationBarTitleText": "助力活动",
 				// "navigationStyle": "custom",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/hot_list",
 			"style": {
 				"navigationBarTitleText": "热销推荐",
 				// "navigationStyle": "custom",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/message/message",
@@ -149,148 +137,118 @@
 			"path": "pages/serve/message/m_system",
 			"style": {
 				"navigationBarTitleText": "系统消息",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/message/m_sys_detail",
 			"style": {
 				"navigationBarTitleText": "系统消息系统消息系统消息",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/message/m_order_mess",
 			"style": {
 				"navigationBarTitleText": "订单消息",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/message/m_comment",
 			"style": {
 				// "navigationBarTitleText": "收到的评论",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/message/m_getlike",
 			"style": {
 				"navigationBarTitleText": "赞",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/message/m_unknow",
 			"style": {
 				"navigationBarTitleText": "陌生人消息",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/serve/message/m_dialog",
 			"style": {
 				"navigationBarTitleText": "BYD",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/serve/repair/repair",
 			"style": {
 				"navigationBarTitleText": "维修",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
-		},{
-			"path": "pages/serve/repair/re_create/select_store",
-			"style": {
-				"navigationBarTitleText": "常规保养",
-				"enablePullDownRefresh" : false
-			}
-		},{
-			"path": "pages/serve/repair/re_create/select_city",
-			"style": {
-				"navigationBarTitleText": "搜索城市",
-				"enablePullDownRefresh" : false
-			}
-		},{
-			"path": "pages/serve/repair/re_create/reservation",
-			"style": {
-				"navigationBarTitleText": "维修预约",
-				"enablePullDownRefresh" : false
-			}
-		},{
-			"path": "pages/serve/repair/re_create/select_time",
-			"style": {
-				"navigationBarTitleText": "预约时间",
-				"enablePullDownRefresh" : false
-			}
-		},{
-			"path": "pages/serve/repair/re_create/result",
-			"style": {
-				"navigationBarTitleText": "维修预约",
-				"enablePullDownRefresh" : false
-			}
-		},{
+		}, {
 			"path": "pages/serve/repair/realname",
 			"style": {
 				"navigationBarTitleText": "完善资料",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/repair/real_result",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/repair/re_binding",
 			"style": {
 				"navigationBarTitleText": "绑定车辆",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/repair/bind_result",
 			"style": {
 				"navigationBarTitleText": "绑定结果",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/coupons/coupons",
 			"style": {
 				"navigationBarTitleText": "卡券",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/coupons/cou_detail",
 			"style": {
 				// "navigationBarTitleText": "卡券详情"
 				"navigationStyle": "custom",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/coupons/cou_detail_reply",
 			"style": {
 				"navigationBarTitleText": "用户评价",
 				// "navigationStyle": "custom",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/coupons/cou_store",
 			"style": {
 				"navigationBarTitleText": "门店列表",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/coupons/cou_card",
 			"style": {
 				"navigationBarTitleText": "优惠券",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/coupons/cou_order",
 			"style": {
 				"navigationBarTitleText": "确认订单",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		}, {
 			"path": "pages/serve/coupons/payresult",
 			"style": {
 				"navigationBarTitleText": "支付结果",
-				"enablePullDownRefresh" : false
+				"enablePullDownRefresh": false
 			}
 		},

@@ -368,21 +326,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		{
-			"path": "pages/mine/my_favorite/my_favorite",
-			"style": {
-				"navigationBarTitleText": "我的收藏",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/mine/car_info/car_info",
 			"style": {
 				"navigationBarTitleText": "车辆信息",
 				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/mine/car_info/carUnbind",
 			"style": {
 				"navigationBarTitleText": "解绑车辆",
@@ -390,19 +340,17 @@
 			}
 		},
 		{
-			"path" : "pages/repair/user/feedback/feedback",
-			"style" : 
-			{
-				"navigationBarTitleText" : "意见反馈",
-				"enablePullDownRefresh" : false
+			"path": "pages/repair/user/feedback/feedback",
+			"style": {
+				"navigationBarTitleText": "意见反馈",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/repair/user/changeCall/changeCall",
-			"style" : 
-			{
-				"navigationBarTitleText" : "账户设置",
-				"enablePullDownRefresh" : false,
+			"path": "pages/repair/user/changeCall/changeCall",
+			"style": {
+				"navigationBarTitleText": "账户设置",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
@@ -509,37 +457,6 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		{
-			"path": "pages/mine/my_order/serveOrder/serve_order",
-			"style": {
-				"navigationBarTitleText": "服务订单",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/mine/my_order/serveOrder/serve_particulars",
-			"style": {
-				"navigationBarTitleText": "服务订单卡券详情",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/mine/my_order/serveOrder/integral_particulars",
-			"style": {
-				"navigationBarTitleText": "服务订单积分详情",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/mine/my_order/serveOrder/work_particulars",
-			"style": {
-				"navigationBarTitleText": "服务订单工单详情",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/mine/my_evaluate/my_evaluate",
 			"style": {
@@ -583,75 +500,67 @@
 			}
 		},
 		{
-			"path" : "pages/mine/my_activity/detail",
-			"style" : 
-			{
-				"navigationBarTitleText" : "卡券详情",
-				"enablePullDownRefresh" : false,
+			"path": "pages/mine/my_activity/detail",
+			"style": {
+				"navigationBarTitleText": "卡券详情",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/index/friend",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false,
+			"path": "pages/index/friend",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/index/consult_detail",
-			"style" :
-			{
-				"navigationBarTitleText" : "资讯",
-				"enablePullDownRefresh" : false,
+			"path": "pages/index/consult_detail",
+			"style": {
+				"navigationBarTitleText": "资讯",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/index/detail",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false,
+			"path": "pages/index/detail",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		}, {
-			"path" : "pages/index/report",
-			"style" : 
-			{
-				"navigationBarTitleText" : "举报",
-				"enablePullDownRefresh" : false,
+			"path": "pages/index/report",
+			"style": {
+				"navigationBarTitleText": "举报",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-		},  {
-			"path" : "pages/index/report_result",
-			"style" : 
-			{
-				"navigationBarTitleText" : "举报结果",
-				"enablePullDownRefresh" : false
-			}
 		}, {
-			"path" : "pages/index/post",
-			"style" :  {
-				"navigationBarTitleText" : "",
+			"path": "pages/index/report_result",
+			"style": {
+				"navigationBarTitleText": "举报结果",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/index/post",
+			"style": {
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
-			}, {
-			"path" : "pages/welfare/rightsInterests/rightsInterests",
-			"style" : 
-			{
-				"navigationBarTitleText" : "积分权益",
-				"enablePullDownRefresh" : false
+		}, {
+			"path": "pages/welfare/rightsInterests/rightsInterests",
+			"style": {
+				"navigationBarTitleText": "积分权益",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/welfare/rightsInterests/rightsInterests_particulars",
-			"style" : 
-			{
-				"navigationBarTitleText" : "积分权益商品详情",
-				"enablePullDownRefresh" : false,
+			"path": "pages/welfare/rightsInterests/rightsInterests_particulars",
+			"style": {
+				"navigationBarTitleText": "积分权益商品详情",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
@@ -663,34 +572,31 @@
 			}
 		},
 		{
-			"path" : "pages/welfare/rightsInterests/confirm_order",
-			"style" : 
-			{
-				"navigationBarTitleText" : "确认订单",
-				"enablePullDownRefresh" : false
+			"path": "pages/welfare/rightsInterests/confirm_order",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/welfare/payment_state/payment_state",
-			"style" : 
-			{
-				"navigationBarTitleText" : "支付结果",
-				"enablePullDownRefresh" : false
+			"path": "pages/welfare/payment_state/payment_state",
+			"style": {
+				"navigationBarTitleText": "支付结果",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/message/message-list",
 			"style": {
-				"navigationBarTitleText" : "系统消息",
-				"enablePullDownRefresh" : false
+				"navigationBarTitleText": "系统消息",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/message/message",
-			"style" : 
-			{
-				"navigationBarTitleText" : "消息",
-				"enablePullDownRefresh" : false,
+			"path": "pages/message/message",
+			"style": {
+				"navigationBarTitleText": "消息",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
@@ -699,120 +605,186 @@
 			"name": "message_Chat",
 			"Login": true,
 			"style": {
-			   "navigationBarTitleText": "加载中...",
-			   "enablePullDownRefresh": false,
-			   "app-plus": {
-			    "bounce": "none",
-			   	"softinputmode": "adjustResize",
-				"titleNView": {
-				    "buttons": [{
-				        "type": "menu"
-				    }]
+				"navigationBarTitleText": "加载中...",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"softinputmode": "adjustResize",
+					"titleNView": {
+						"buttons": [{
+							"type": "menu"
+						}]
+					}
 				}
-			   }
 			}
 		},
 		{
-			"path" : "pages/mine/business_cooperation/business_cooperation",
-			"style" : 
-			{
-				"navigationBarTitleText" : "商务合作",
-				"enablePullDownRefresh" : false
+			"path": "pages/mine/business_cooperation/business_cooperation",
+			"style": {
+				"navigationBarTitleText": "商务合作",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/mine/business_cooperation/submit",
-			"style" : 
-			{
-				"navigationBarTitleText" : "提交结果",
-				"enablePullDownRefresh" : false
+			"path": "pages/mine/business_cooperation/submit",
+			"style": {
+				"navigationBarTitleText": "提交结果",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/mine/every_day_card/every_day_card",
-			"style" : 
-			{
-				"navigationBarTitleText" : "天天打卡",
-				"enablePullDownRefresh" : false,
+			"path": "pages/welfare/activity_x/activity_x",
+			"style": {
+				"navigationBarTitleText": "话题活动详情",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/mine/every_day_card/previous_list",
-			"style" : 
-			{
-				"navigationBarTitleText" : "往期开奖",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/welfare/activity_x/activity_x",
-			"style" : 
-			{
-				"navigationBarTitleText" : "话题活动详情",
-				"enablePullDownRefresh" : false,
+			"path": "pages/welfare/activity_x/post",
+			"style": {
+				"navigationBarTitleText": "发布话题",
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-		},
-		{
-			"path" : "pages/welfare/activity_x/post",
-			"style" : 
-			{
-				"navigationBarTitleText" : "发布话题",
-				"enablePullDownRefresh" : false,
-				"navigationStyle": "custom"
-			}
-		},{
-			"path" : "pages/welfare/activity_x/topic_list",
-			"style" : 
-			{
-				"navigationBarTitleText" : "选择话题",
-				"enablePullDownRefresh" : false
+		}, {
+			"path": "pages/welfare/activity_x/topic_list",
+			"style": {
+				"navigationBarTitleText": "选择话题",
+				"enablePullDownRefresh": false
 			}
 		},
-		
+
 		{
-			"path" : "pages/mine/my_order/rentCars/examine_contract",
-			"style" : 
-			{
-				"navigationBarTitleText" : "查看合同",
-				"enablePullDownRefresh" : false
+			"path": "pages/mine/my_order/rentCars/examine_contract",
+			"style": {
+				"navigationBarTitleText": "查看合同",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/mine/my_order/evaluate_order/evaluate_order",
-			"style" : 
-			{
-				"navigationBarTitleText" : "发布评价",//租车订单
-				"enablePullDownRefresh" : false
+			"path": "pages/mine/my_order/evaluate_order/evaluate_order",
+			"style": {
+				"navigationBarTitleText": "发布评价", //租车订单
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/mine/my_order/evaluate_order/review_x",
-			"style" : 
-			{
-				"navigationBarTitleText" : "评价详情",//租车订单
-				"enablePullDownRefresh" : false
+			"path": "pages/mine/my_order/evaluate_order/review_x",
+			"style": {
+				"navigationBarTitleText": "评价详情", //租车订单
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/mine/my_order/evaluate_order/evaluate_list",
-			"style" : 
-			{
-				"navigationBarTitleText" : "我的评价",//租车订单
-				"enablePullDownRefresh" : false
+			"path": "pages/mine/my_order/evaluate_order/evaluate_list",
+			"style": {
+				"navigationBarTitleText": "我的评价", //租车订单
+				"enablePullDownRefresh": false
 			}
 		}
 	],
 	"subPackages": [{
-			"root": "pagesA",
-			"pages": [{
+		"root": "pagesA",
+		"pages": [{
 			"path": "common/textview/index",
 			"style": {
 				"navigationBarTitleText": "富文本解析页面",
 				"navigationStyle": "custom"
 			}
-		}]
+		},{
+			"path": "serve/repair/re_create/select_city",
+			"style": {
+				"navigationBarTitleText": "搜索城市",
+				"enablePullDownRefresh" : false
+			}
+		}, {
+			"path": "serve/repair/re_create/select_store",
+			"style": {
+				"navigationBarTitleText": "常规保养",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "serve/repair/re_create/result",
+			"style": {
+				"navigationBarTitleText": "维修预约",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "serve/repair/re_create/reservation",
+			"style": {
+				"navigationBarTitleText": "维修预约",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "serve/repair/re_create/select_time",
+			"style": {
+				"navigationBarTitleText": "预约时间",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "showroom/confirmOrder/confirmOrder",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"navigationBarBackgroundColor": "#f5f5f5"
+			}
+		},
+		{
+			"path": "my_favorite/my_favorite",
+			"style": {
+				"navigationBarTitleText": "我的收藏",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "my_order/serveOrder/serve_order",
+			"style": {
+				"navigationBarTitleText": "服务订单",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "my_order/serveOrder/serve_particulars",
+			"style": {
+				"navigationBarTitleText": "服务订单卡券详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "my_order/serveOrder/integral_particulars",
+			"style": {
+				"navigationBarTitleText": "服务订单积分详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "my_order/serveOrder/work_particulars",
+			"style": {
+				"navigationBarTitleText": "服务订单工单详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "every_day_card/every_day_card",
+			"style": {
+				"navigationBarTitleText": "天天打卡",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "every_day_card/previous_list",
+			"style": {
+				"navigationBarTitleText": "往期开奖",
+				"enablePullDownRefresh": false
+			}
+		}
+		]
 	}],
 	"tabBar": {
 		"color": "#666666",
@@ -844,11 +816,11 @@
 			"text": "我的"
 		}]
 	},
-	
+
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "星桔",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
-	
+
 }
--- a/pages/serve/coupons/payresult.vue
+++ b/pages/serve/coupons/payresult.vue
@@ -51,7 +51,7 @@
 			},
 			toServeOrderPage(){
 				uni.navigateTo({
-					url:`/pages/mine/my_order/serveOrder/serve_order`,
+					url:`/pagesA/my_order/serveOrder/serve_order`,
 				})
 			},
 			toMyCardBagPage() {
--- a/pages/serve/index.vue
+++ b/pages/serve/index.vue
@@ -244,7 +244,7 @@
 			selectCityBtn(){
 				// console.log('选择城市');
 				uni.navigateTo({
-					url:'/pages/serve/repair/re_create/select_city'
+					url:'/pagesA/serve/repair/re_create/select_city'
 				})
 			},
 			// 卡券
--- a/pages/serve/message/m_order_mess.vue
+++ b/pages/serve/message/m_order_mess.vue
@@ -52,7 +52,7 @@
 				} else {
 					// console.log('工单');
 					uni.navigateTo({
-						url: `/pages/mine/my_order/serveOrder/work_particulars?id=${orderNo}`
+						url: `/pagesA/my_order/serveOrder/work_particulars?id=${orderNo}`
 					})
 				}
 			},
--- a/pages/serve/repair/repair.vue
+++ b/pages/serve/repair/repair.vue
@@ -145,7 +145,7 @@
 							this.whoBtn=2
 						}else {
 							this.$store.dispatch('HomeNum', num)
-							uni.navigateTo({ url: `/pages/serve/repair/re_create/select_store` })
+							uni.navigateTo({ url: `/pagesA/serve/repair/re_create/select_store` })
 						}
 					})
 				}
--- a/pages/showroom/carBuy/predetermine.vue
+++ b/pages/showroom/carBuy/predetermine.vue
@@ -255,7 +255,7 @@
 					this.endTrimIds.interior = this.commodityDeta.interiorList[0]
 				}
 				uni.navigateTo({
-					url: `/pages/showroom/confirmOrder/confirmOrder?type=${this.type}`,
+					url: `/pagesA/showroom/confirmOrder/confirmOrder?type=${this.type}`,
 					success:res=>{
 						 // 通过eventChannel向被打开页面传送数据
 						res.eventChannel.emit('form', {...this.endTrimIds,...this.commodityDeta})
--- a/pages/showroom/carRental/index.vue
+++ b/pages/showroom/carRental/index.vue
@@ -407,7 +407,7 @@
 			navEndOrderFn() {
 				this.$store.dispatch('Cardmoney', null)
 				uni.navigateTo({
-					url: `/pages/showroom/confirmOrder/confirmOrder?type=2`,
+					url: `/pagesA/showroom/confirmOrder/confirmOrder?type=2`,
 					success: res => {
 						// 通过eventChannel向被打开页面传送数据
 						res.eventChannel.emit('form', {
--- a/pages/showroom/index.vue
+++ b/pages/showroom/index.vue
@@ -11,7 +11,7 @@
 			
 			<view class="nav-btn flex align-center justify-between">
 				<view class="nav-city flex align-center justify-between"
-					@click="$tab.navigateTo('/pages/serve/repair/re_create/select_city')">
+					@click="$tab.navigateTo('/pagesA/serve/repair/re_create/select_city')">
 					<u-icon name="map" :color="showNavImg && '#111' || '#fff'" size="14"></u-icon>
 					<text style="z-index: 99999; " :class="showNavImg&&'black'">{{selectCity||'杭州'}}</text>
 					<u-icon name="arrow-right" :color="showNavImg && '#111' || '#fff'" size="10"></u-icon>
--- a/pages/welfare/payment_state/payment_state.vue
+++ b/pages/welfare/payment_state/payment_state.vue
@@ -42,7 +42,7 @@
 		methods: {
 			toMyCardBagPage() {
 				uni.redirectTo({
-					url: '/pages/mine/my_order/serveOrder/serve_order'
+					url: '/pagesA/my_order/serveOrder/serve_order'
 				})
 			},
 			toHomePage() {
--- a/pages/mine/every_day_card/every_day_card.vue
+++ b/pages/mine/every_day_card/every_day_card.vue
@@ -31,7 +31,7 @@
 					<text>规则</text>
 				</view>
 				<view class="header-bj-rule-box" style="margin-top: 44rpx;"
-					@click="$tab.navigateTo('/pages/mine/every_day_card/previous_list')">
+					@click="$tab.navigateTo('/pagesA/every_day_card/previous_list')">
 					<image :src="`${config.aliyunOssUrl}/static/images/app/activity/guize.png`" mode="">
 					</image>
 					<text>往期</text>
--- a/pages/mine/every_day_card/previous_list.vue
+++ b/pages/mine/every_day_card/previous_list.vue
--- a/pages/mine/my_favorite/my_favorite.vue
+++ b/pages/mine/my_favorite/my_favorite.vue
--- a/pages/mine/my_order/serveOrder/integral_particulars.vue
+++ b/pages/mine/my_order/serveOrder/integral_particulars.vue
--- a/pages/mine/my_order/serveOrder/serve_order.vue
+++ b/pages/mine/my_order/serveOrder/serve_order.vue
@@ -475,15 +475,15 @@
 				console.log(this.typeOne);
 				if (this.typeOne == 3) {
 					uni.navigateTo({
-						url: `/pages/mine/my_order/serveOrder/serve_particulars?id=${item.id}`
+						url: `/pagesA/my_order/serveOrder/serve_particulars?id=${item.id}`
 					})
 				} else if (this.typeOne == 2) {
 					uni.navigateTo({
-						url: `/pages/mine/my_order/serveOrder/integral_particulars?id=${item.id}`
+						url: `/pagesA/my_order/serveOrder/integral_particulars?id=${item.id}`
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pages/mine/my_order/serveOrder/work_particulars?id=${item.orderSn}`
+						url: `/pagesA/my_order/serveOrder/work_particulars?id=${item.orderSn}`
 					})
 				}
 			},
--- a/pages/mine/my_order/serveOrder/serve_particulars.vue
+++ b/pages/mine/my_order/serveOrder/serve_particulars.vue
--- a/pages/mine/my_order/serveOrder/work_particulars.vue
+++ b/pages/mine/my_order/serveOrder/work_particulars.vue
--- a/pagesA/serve/repair/re_create/reservation.vue
+++ b/pagesA/serve/repair/re_create/reservation.vue
@@ -218,7 +218,7 @@
      // 去选择时间
      openTime() {
        uni.navigateTo({
-          url: `/pages/serve/repair/re_create/select_time`,
+          url: `/pagesA/serve/repair/re_create/select_time`,
        });
      },
      // 确认提交
@@ -239,7 +239,7 @@
          reservationCreateAPI(this.createData)
            .then((res) => {
              uni.navigateTo({
-                url: "/pages/serve/repair/re_create/result",
+                url: "/pagesA/serve/repair/re_create/result",
              });
            })
        }
--- a/pagesA/serve/repair/re_create/result.vue
+++ b/pagesA/serve/repair/re_create/result.vue
--- a/pagesA/serve/repair/re_create/select_city.vue
+++ b/pagesA/serve/repair/re_create/select_city.vue
@@ -53,7 +53,7 @@
 <script>
 	import { getHotCityAPI } from '@/api/serve/repair'
 	import { mapGetters } from 'vuex'
-	const area = require('../../../../data/address_a.js')
+	const area = require('@/data/address_a.js')
 	import {getLocationFn} from "@/utils/index.js"
 	export default {
 		data() {
@@ -66,6 +66,7 @@
 				isShow:true,
 				// 顺序城市索引
 				cityIndex:null,
+				
 			};
 		},
 		computed: {
--- a/pagesA/serve/repair/re_create/select_store.vue
+++ b/pagesA/serve/repair/re_create/select_store.vue
@@ -18,7 +18,7 @@
      <z-paging ref="paging" :fixed="false" use-page-scroll auto-full-height v-model="dataList" @query="queryList">
        <view class="posfoot">
          <view class="footview" hover-class="hover-footview" v-for="(item,index) in dataList" :key="item.id"
-            @click="link(`/pages/serve/repair/re_create/reservation?id=${item.id}`,`${item.id}`)">
+            @click="link(`/pagesA/serve/repair/re_create/reservation?id=${item.id}`,`${item.id}`)">
            <view class="footleft">
              <image class="footleft_img" :src="item.backImage"></image>
              <!-- coverImage 封面图   backImage 背景图   avatar 头像 -->
--- a/pagesA/serve/repair/re_create/select_time.vue
+++ b/pagesA/serve/repair/re_create/select_time.vue
--- a/pagesA/showroom/confirmOrder/confirmOrder.vue
+++ b/pagesA/showroom/confirmOrder/confirmOrder.vue
@@ -366,7 +366,6 @@
 		</u-popup>
 	</view>
 </template>
-
 <script>
 	import {
 		mapGetters
@@ -383,7 +382,6 @@
 	import {
 		getCouponListAPI,
 	} from '@/api/serve/coupons'
-	const address = require('@/data/address.js')
 	export default {
 		computed: {
 			...mapGetters(['cardmoney'])
@@ -671,12 +669,13 @@
 		},
 		onLoad(optons) {
 			this.orderType = optons.type
-			let arr = address.data
+			let arr =this.$address.address
+			// console.log(this.$address);
 			arr.forEach((item, index) => {
-				this.city[0].push(item.name)
-				item.children.forEach(i => {
+				this.city[0].push(item.regionName)
+				item.child.forEach(i => {
 					if (!this.columnData[index]) this.columnData[index] = []
-					this.columnData[index].push(i.name)
+					this.columnData[index].push(i.regionName)
 				})
 			})
 			this.city[1] = this.columnData[0]
--- a/static/logo.png
+++ b/static/logo.png
--- a/uni_modules/uni-list/readme.md
+++ b/uni_modules/uni-list/readme.md
@@ -259,17 +259,17 @@ footer	|	右/下内容插槽，可完全自定义右侧内容
 <uni-list>
 	<uni-list-item title="自定义右侧插槽" note="列表描述信息" link>
 		<template slot="header">
-			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
+			<image class="slot-image" src="https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/logo.png" mode="widthFix"></image>
 		</template>
 	</uni-list-item>
 	<uni-list-item>
 		<!-- 自定义 header -->
-		<view slot="header" class="slot-box"><image class="slot-image" src="/static/logo.png" mode="widthFix"></image></view>
+		<view slot="header" class="slot-box"><image class="slot-image" src="https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/logo.png" mode="widthFix"></image></view>
 		<!-- 自定义 body -->
 		<text slot="body" class="slot-box slot-text">自定义插槽</text>
 		<!-- 自定义 footer-->
 		<template slot="footer">
-			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
+			<image class="slot-image" src="https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/logo.png" mode="widthFix"></image>
 		</template>
 	</uni-list-item>
 </uni-list>