feat：修改

common/js/env.js

@@ -2,17 +2,22 @@
 
 /** 正式环境 **/
 let releaseBaseUrl = `https://jje.xinyuekj.com.cn/prod-api`
+let releaseActivityImgUrl = `https://minio.xinyuekj.com.cn/jje/`
 
 /** 测试环境 */
 let trialBaseUrl = `https://jje.xinyuekj.com.cn/test-api`
+let trialActivityImgUrl = `https://minio.xinyuekj.com.cn/jje-test/`
 
 /** 开发环境*/
 // let developBaseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
 // let developBaseUrl = `https://jje.xinyuekj.com.cn/prod-api`
 let developBaseUrl = `https://jje.xinyuekj.com.cn/test-api`
+let developActivityImgUrl = `https://minio.xinyuekj.com.cn/jje-test/`
 
 
 let baseUrl = ''
+let activityImgUrl = ''
+
 
 function getBaseUrl(key) {
 	let accountInfo = uni.getAccountInfoSync()
@@ -32,7 +37,27 @@ function getBaseUrl(key) {
 	return baseUrl;
 }
 
+function getActivityImgUrl(key) {
+	let accountInfo = uni.getAccountInfoSync()
+	let prefix = accountInfo.miniProgram.envVersion
+
+	if (prefix === 'release'){
+		activityImgUrl = releaseActivityImgUrl
+	}
+
+	if (prefix === 'trial'){
+		activityImgUrl = trialActivityImgUrl
+	}
+
+	if (prefix === 'develop'){
+		activityImgUrl = developActivityImgUrl
+	}
+	return activityImgUrl;
+}
+
+
 export default {
 	uploadUrl: '/v1/file/put-file',
-	baseUrl: getBaseUrl()
+	baseUrl: getBaseUrl(),
+	activityImgUrl: getActivityImgUrl(),
 }

main.js

@@ -9,10 +9,12 @@ import env from './common/js/env'
 
 import uView from "uview-ui";
 const baseUrl = env.baseUrl;
+const activityImgUrl = env.activityImgUrl;
 Vue.use(uView);
 Vue.config.productionTip = false
 Vue.prototype.$phonePattern = '^1[3-9][0-9]\\d{8}$';
 Vue.prototype.$baseUrl = baseUrl;
+Vue.prototype.$activityImgUrl = activityImgUrl;
 Vue.prototype.$api = api;
 App.mpType = 'app'
 const app = new Vue({

orderPages/bookService/index.rpx.scss

@@ -84,7 +84,7 @@
 .group2{
   background: #FFFFFF;
   padding: 0 32rpx;
-  height: 260rpx;
+  height: 212rpx;
   position: fixed;
   bottom: 0;
   z-index: 5;

orderPages/bookService/index.vue

@@ -142,17 +142,21 @@
 			</view>
 		</view>
 
-		<view :style="{'height':'280rpx'}"></view>
+    <view v-if="recommendActivity" class="flex-row justify-center" style="background: #ffffff;margin-top: 20rpx;padding: 10rpx 32rpx">
+      <image style="width: 686rpx" :src="activityImg" mode="widthFix" @click="goDetail(recommendActivity)"></image>
+    </view>
+
+		<view :style="{'height':'236rpx'}"></view>
 
 		<view class="flex-col  group2 ">
 
-      <view v-if="recommendActivity" class="btnTitle1 flex-row justify-between">
-        <view>
-          <text>推荐活动：{{recommendActivity.title}}</text>
-          <text style="margin-left: 10rpx;color: #999999" >（{{recommendActivity.description}}）</text>
-        </view>
-        <view class="btnRight1" @click="goDetail(recommendActivity)">购买({{recommendActivity.salePrice}})</view>
-      </view>
+<!--      <view v-if="recommendActivity" class="btnTitle1 flex-row justify-between">-->
+<!--        <view>-->
+<!--          <text>推荐活动：{{recommendActivity.title}}</text>-->
+<!--          <text style="margin-left: 10rpx;color: #999999" >（{{recommendActivity.description}}）</text>-->
+<!--        </view>-->
+<!--        <view class="btnRight1" @click="goDetail(recommendActivity)">购买({{recommendActivity.salePrice}})</view>-->
+<!--      </view>-->
 
 			<view class="btnTitle flex-row">
 				<u-icon v-if="selectIcon" name="checkmark-circle-fill" color="#FFE52C" size="18"
@@ -285,6 +289,7 @@
         takeNumberRules:[],
         storeInfo: {},
         expireEquityCard:[], //过期的权益卡
+        activityImg:'',
 			}
 		},
 		onLoad() {
@@ -311,7 +316,7 @@
       this.getRecommendActivity();
 		},
 		onShow() {
-
+      this.getActivityImg()
 			//获取弹窗设置
 			let reservationQueueContent = uni.getStorageSync('reservation_queue_content');
 			if (!reservationQueueContent){
@@ -340,6 +345,19 @@
 		},
 		methods: {
 
+      getActivityImg(){
+        this.$api.getSelectionRules({
+          dictType:'recommended_images'
+        }).then(res => {
+
+          if (res.data.rows.length > 0){
+            let url = this.$activityImgUrl
+            this.activityImg = url + res.data.rows[0].dictValue
+            console.log("++++++++++this.activityImg++++++++++",this.activityImg)
+          }
+        })
+      },
+
       goDetail(e){
         uni.navigateTo({
           url:'/orderPages/activityDetail/activityDetail?id=' + e.id

orderPages/storeService/index.rpx.scss

@@ -39,11 +39,11 @@
   padding: 0 24rpx;
 }
 .tabBarLineHeight {
-  height: 220rpx;
+  height: 138rpx;
 }
 .tabBarView {
   width: 750rpx;
-  height: 200rpx;
+  height: 138rpx;
   background: #ffffff;
   position: fixed;
   left: 0;

orderPages/storeService/index.vue

@@ -94,15 +94,20 @@
 <!--				<text>4.服务费用到店享受相应服务以后在另行收取。</text>-->
 <!--			</view>-->
 		</view>
+
+    <view v-if="recommendActivity" class="flex-row justify-center" style="background: #ffffff;margin-top: 20rpx;padding: 10rpx 32rpx">
+      <image style="width: 686rpx" :src="activityImg" mode="widthFix" @click="goDetail(recommendActivity)"></image>
+    </view>
+
 		<view class="tabBarLineHeight "></view>
 		<view class="tabBarView">
-      <view v-if="recommendActivity" class="btnTitle1 flex-row justify-between">
-        <view>
-          <text>推荐活动：{{recommendActivity.title}}</text>
-          <text style="margin-left: 10rpx;color: #999999" >（{{recommendActivity.description}}）</text>
-        </view>
-        <view class="btnRight1" @click="goDetail(recommendActivity)">购买({{recommendActivity.salePrice}})</view>
-      </view>
+<!--      <view v-if="recommendActivity" class="btnTitle1 flex-row justify-between">-->
+<!--        <view>-->
+<!--          <text>推荐活动：{{recommendActivity.title}}</text>-->
+<!--          <text style="margin-left: 10rpx;color: #999999" >（{{recommendActivity.description}}）</text>-->
+<!--        </view>-->
+<!--        <view class="btnRight1" @click="goDetail(recommendActivity)">购买({{recommendActivity.salePrice}})</view>-->
+<!--      </view>-->
 			<view class="submitButton " @click="openSetting">提交</view>
 		</view>
 
@@ -204,6 +209,7 @@
         takeNumberRules:[],
         storeInfo: {},
         expireEquityCard:[], //过期的权益卡
+        activityImg:"",
 			}
 		},
 		onLoad() {
@@ -231,9 +237,7 @@
       this.getRecommendActivity();
 		},
 		onShow() {
-
-
-
+      this.getActivityImg()
 			//获取弹窗设置
 			let sameDayQueueContent = uni.getStorageSync('same_day_queue_content');
 			if (!sameDayQueueContent){
@@ -260,6 +264,19 @@
 		},
 		methods: {
 
+      getActivityImg(){
+        this.$api.getSelectionRules({
+          dictType:'recommended_images'
+        }).then(res => {
+
+          if (res.data.rows.length > 0){
+            let url = this.$activityImgUrl
+            this.activityImg = url + res.data.rows[0].dictValue
+            console.log("++++++++++this.activityImg++++++++++",this.activityImg)
+          }
+        })
+      },
+
       goDetail(e){
         uni.navigateTo({
           url:'/orderPages/activityDetail/activityDetail?id=' + e.id

pages/order/module/index.rpx.css

@@ -401,7 +401,7 @@
     font-size: 26rpx;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
-    color: red;
+    color: #ED569F;
     line-height: 28rpx;
     padding-right: 62rpx;
 }

pages/order/module/mescrollUni-item.vue

@@ -78,20 +78,14 @@
 
 								<view class="flex-col justify-center" v-if="item.serviceAttribute == 1">
 									<view class="planNumber flex-row justify-center">
-										<text>{{ item.planNumber || '未排号' }}</text>
+                    <text>C号段</text>	<text style="margin-left: 10rpx">{{ item.planNumber || '未排号' }}</text>
 									</view>
-
-									<view class="planNumber1 flex-row justify-center">
-										<text>C号段</text>
-									</view>
-                  <view class="planNumber1 flex-row justify-center">
+                  <view class="planNumber1 flex-row justify-center" style="margin-top: 10rpx">
                     <text>提前半小时签到哟</text>
                   </view>
 
 								</view>
 
-
-
 							</view>
 							<view class="detail flex-row justify-between" v-if="item.serviceAttribute == '2' " >
 								<view class="flexLR">
@@ -123,13 +117,9 @@
 									</view>
 									<view class=" flex-col justify-center">
 										<view class="planNumber flex-row justify-center">
-											<text>{{ item.planNumber || '未排号' }}</text>
-										</view>
-
-										<view class="planNumber1 flex-row justify-center">
-											<text>A号段</text>
+                      <text>A号段</text> <text style="margin-left: 10rpx">{{ item.planNumber || '未排号' }}</text>
 										</view>
-                    <view class="planNumber1 flex-row justify-center">
+                    <view class="planNumber1 flex-row justify-center" style="margin-top: 10rpx">
                       <text>提前半小时签到哟</text>
                     </view>
 									</view>