订单相关修改，报名活动数据分离

api/common.js

@@ -241,7 +241,8 @@ export function homeSearch(data) {
 // 城市列表
 export function getCityList(data) {
   return request({
-    url: `/productcenterserver/region/list?name=${data.name}&type=City&page=${data.page}&size=${data.size}`,
+	  url:`/productcenterserver/region/childRegionsList?parentId=${data.parentId}&page=${data.page}&size=${data.size}`,
+    // url: `/productcenterserver/region/list?name=${data.name}&type=City&page=${data.page}&size=${data.size}`,
     method: 'post',
   })
 }

api/order.js

@@ -29,8 +29,8 @@ export function creatScanOrder(data) {
 // 获取订单最优优惠券
 export function calculate(data) {
 	return request({
-		url: '/zswl-cloud-shop/goodsInfo/calculate',
-		// url: '/zswl-cloud-shop/goodsInfo/calculate2',
+		// url: '/zswl-cloud-shop/goodsInfo/calculate',
+		url: '/zswl-cloud-shop/goodsInfo/calculate2',
 		method:'post',
 		data
 	})

detail/discountsDetail/index.vue

@@ -32,11 +32,11 @@
 								￥
 							</view>
 							<view class="price">
-								{{i.realPrice}}
+								{{ i.platformPrice?i.platformPrice.price:i.realPrice}}
 							</view>
 							<view class="discount-tag" v-if="i.marketPrice">
 								<view class="discount-num">
-									{{((i.realPrice/i.marketPrice)*10).toFixed(1)}}折
+									{{(((i.platformPrice?i.platformPrice.price:i.realPrice)/i.marketPrice)*10).toFixed(1)}}折
 								</view>
 							</view>
 							<view class="old-price">
@@ -79,6 +79,7 @@
 				banner: '',
 				menuId:'',
 				query: {
+					platform:'520100',//慧研学520100 中数5201000 贵大 p-0001
 					district:'',
 					menuId: '',
 					queryName: '',

hotel/cityList.vue

@@ -27,6 +27,7 @@
 		data() {
 			return {
 				query:{
+					parentId:'520100',//慧研学520100 中数5201000 贵大 p-0001
 					name:'',
 					page:0,
 					size:30,

my/order/refundDetail.vue

@@ -6,7 +6,7 @@
 					 {{info.goodsList[0].goodsState == 'REFUNDED'?'退款成功':'退款中'}}
 				</view>
 				<view class="progress-desc">
-				{{info.goodsList[0].refundLog.refundAmount?'如您未查询到退款，请拨打10086咨询客服':'	请耐心等待，正在为您处理退款'}}
+				{{info.goodsList[0].refundLog.refundAmount?'如您未查询到退款，请联系平台客服':'	请耐心等待，正在为您处理退款'}}
 				</view>
 				<u-steps dot current="0" activeColor="#FF4D3A" direction="column">
 						<u-steps-item v-for="(item,index) in stepList" :key="index" :title="item.desc" :desc="$u.timeFormat(info.goodsList[0].refundLog[item.time], 'yyyy-mm-dd hh:MM:ss')">

my/order/signUp/refundDetail.vue

@@ -6,7 +6,7 @@
 					 {{info.goodsList[0].goodsState == 'REFUNDED'?'退款成功':'退款中'}}
 				</view>
 				<view class="progress-desc">
-				{{info.goodsList[0].refundLog.refundAmount?'如您未查询到退款，请拨打10086咨询客服':'	请耐心等待，正在为您处理退款'}}
+				{{info.goodsList[0].refundLog.refundAmount?'如您未查询到退款，请联系平台客服':'	请耐心等待，正在为您处理退款'}}
 				</view>
 				<u-steps dot current="0" activeColor="#FF4D3A" direction="column">
 						<u-steps-item v-for="(item,index) in stepList" :key="index" :title="item.desc" :desc="$u.timeFormat(info.goodsList[0].refundLog[item.time], 'yyyy-mm-dd hh:MM:ss')">

pages.json

@@ -399,7 +399,7 @@
 				{
 					"path": "index/index",
 					"style": {
-						"navigationBarTitleText": "出行",
+						"navigationBarTitleText": "代驾",
 						"navigationStyle": "custom",
 						"disableScroll": true
 					}

pages/index/index.vue

@@ -606,7 +606,8 @@
 			},
 			getCityList() {
 				return new Promise((resolve,reject)=>{
-					getCityList({name:'',page:0,size:999}).then(res=>{
+					// parentId:'520100',//慧研学520100 中数5201000 贵大 p-0001
+					getCityList({parentId:'520100',name:'',page:0,size:999}).then(res=>{
 						if(res.state == 'Success'){
 							let city = this.city.replace('市','')
 							res.content.content.forEach(item=>{

refuel/index.vue

@@ -148,6 +148,7 @@
 								}
 							})
 							this.list = this.list.concat(dataList)
+							console.log(this.list);
 							if (this.list.length >= res.content.total) {
 								this.status = 'noMore'
 							} else {

signUp/makeOut.vue

@@ -487,6 +487,7 @@
 					let that = this
 					if (!this.payData.timeStamp) {
 						createOrder({
+							code:520100,
 							activityId: this.activity.id,
 							serviceId,
 							channel:'ZhongShu',

trip/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="trip">
-		<zs-header title="出行" :backCall="backCall" color="#000"></zs-header>
+		<zs-header title="代驾" :backCall="backCall" color="#000"></zs-header>
 		<map id="Map" class="map" style="width: 100%;" :scale="scale" :longitude="longitude" :latitude="latitude"
 			:includePoints="includePoints" enable-poi :polyline="polyline" show-location :markers="markers"
 			@regionchange="mapChange">