Browse Source

fix:取号规则 由后台配置

xyh8905170 2 years ago
parent
commit
248720d853
4 changed files with 39 additions and 20 deletions
  1. 9 0
      common/js/api.js
  2. 1 0
      myPages/systemSwitch/index.vue
  3. 29 19
      orderPages/storeService/index.vue
  4. 0 1
      pages/index/index.vue

+ 9 - 0
common/js/api.js

@@ -790,6 +790,14 @@ export default {
             method: 'GET'
             method: 'GET'
         })
         })
     },
     },
+    //获取取号规则
+    getSelectionRules(data){
+        return request({
+            url:'/system/dict/data/list',
+            method:'GET',
+            data: data
+        })
+    },
 //	关于我们
 //	关于我们
     AboutByType(data) {
     AboutByType(data) {
         return request({
         return request({
@@ -799,4 +807,5 @@ export default {
         })
         })
     },
     },
 
 
+
 }
 }

+ 1 - 0
myPages/systemSwitch/index.vue

@@ -544,6 +544,7 @@ export default {
       }).catch((res) => {
       }).catch((res) => {
         console.log(res.msg)
         console.log(res.msg)
         uni.showToast({
         uni.showToast({
+
           title: res.msg
           title: res.msg
         })
         })
       });
       });

+ 29 - 19
orderPages/storeService/index.vue

@@ -54,18 +54,21 @@
 			<view class="groupItemKey">
 			<view class="groupItemKey">
 				<text>取号规则</text>
 				<text>取号规则</text>
 			</view>
 			</view>
-			<view class="serobReminder">
-				<text>1.你已进入不挑师傅不挑时段的单剪造型占位理发服务。</text>
-			</view>
-			<view class="serobReminder">
-				<text>2.预约需要一人一号。</text>
-			</view>
-			<view class="serobReminder">
-				<text>3.到门店先签到,过时没有签到占位时段失效。</text>
-			</view>
-			<view class="serobReminder">
-				<text>4.服务费用到店享受相应服务以后在另行收取。</text>
-			</view>
+      <view v-for=" (item,index) in takeNumberRules " class="serobReminder">
+        <text>{{index+1}}.{{item.dictValue}}。</text>
+      </view>
+<!--			<view class="serobReminder">-->
+<!--				<text>1.你已进入不挑师傅不挑时段的单剪造型占位理发服务。</text>-->
+<!--			</view>-->
+<!--			<view class="serobReminder">-->
+<!--				<text>2.预约需要一人一号。</text>-->
+<!--			</view>-->
+<!--			<view class="serobReminder">-->
+<!--				<text>3.到门店先签到,过时没有签到占位时段失效。</text>-->
+<!--			</view>-->
+<!--			<view class="serobReminder">-->
+<!--				<text>4.服务费用到店享受相应服务以后在另行收取。</text>-->
+<!--			</view>-->
 		</view>
 		</view>
 		<view class="tabBarLineHeight "></view>
 		<view class="tabBarLineHeight "></view>
 		<view class="tabBarView">
 		<view class="tabBarView">
@@ -77,7 +80,6 @@
 
 
 <script>
 <script>
 	export default {
 	export default {
-
 		components: {
 		components: {
 		},
 		},
 		data() {
 		data() {
@@ -106,8 +108,13 @@
 						//   serviceStartTime: ''
 						//   serviceStartTime: ''
 						// }
 						// }
 					]
 					]
-				}
-
+				},
+        takeNumberData:{
+				  pageNum:1,
+          pageSize:10,
+          dictType:'today_make_rule'
+        },
+        takeNumberRules:[],
 			}
 			}
 		},
 		},
 		onLoad() {
 		onLoad() {
@@ -117,7 +124,6 @@
 			let date = new Date();
 			let date = new Date();
 			this.orderParam.serviceDate = date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' +
 			this.orderParam.serviceDate = date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' +
 				date.getDate()).slice(-2)
 				date.getDate()).slice(-2)
-
 			 this.timeoutId = setTimeout(()=>{
 			 this.timeoutId = setTimeout(()=>{
 				uni.showModal({
 				uni.showModal({
 					title:'温馨提示',
 					title:'温馨提示',
@@ -136,6 +142,7 @@
 		onShow() {
 		onShow() {
 			this.getServicePersonTime()
 			this.getServicePersonTime()
 			this.getTemplateList()
 			this.getTemplateList()
+      this.getSelectionRules(this.takeNumberData)
 		},
 		},
 		onUnload(){
 		onUnload(){
 			clearTimeout(this.timeoutId);
 			clearTimeout(this.timeoutId);
@@ -146,7 +153,6 @@
 					url: '/pages/index/index',
 					url: '/pages/index/index',
 				})
 				})
 			},
 			},
-
 			selectServiceTime(items,index,index2){
 			selectServiceTime(items,index,index2){
 				items.forEach(e=>{
 				items.forEach(e=>{
 					e.select=false
 					e.select=false
@@ -289,6 +295,12 @@
 					})
 					})
 				})
 				})
 			},
 			},
+      getSelectionRules(data){
+        this.$api.getSelectionRules(data).then(res=>{
+          console.log(res.data.rows,'222222222222')
+          this.takeNumberRules = res.data.rows
+        })
+      },
 
 
 			openSetting(){
 			openSetting(){
 
 
@@ -327,8 +339,6 @@
 			},
 			},
 
 
 			commonGeneralOrder() {
 			commonGeneralOrder() {
-
-
 				if (!this.orderParam.childService.length) {
 				if (!this.orderParam.childService.length) {
 					uni.$u.toast('请选择服务对象')
 					uni.$u.toast('请选择服务对象')
 					return
 					return

+ 0 - 1
pages/index/index.vue

@@ -406,7 +406,6 @@ export default {
 
 
     // 去服务点单页面
     // 去服务点单页面
     gotoServiceOrder() {
     gotoServiceOrder() {
-
       uni.navigateTo({
       uni.navigateTo({
         url: '/orderPages/storeService/index'
         url: '/orderPages/storeService/index'
       })
       })