合并

common/router/modules/routes.js

@@ -348,6 +348,14 @@ const routes = [{
 			title: '编辑门店',
 		},
 	},
+	{
+		path: '/pages/store/examine',
+		name: 'examineStore',
+		meta: {
+			title: '审核查询',
+		},
+	},
+	
 	
 ]
 export default routes

common/service/service.js

@@ -42,7 +42,7 @@ http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */
   if(getTokenStorage()){
     config.header = {
       ...config.header,
-      'AppType':'AppType',
+      'AppType':'2',
        'X-Access-Token':getTokenStorage()
     }
   }

components/index_nav.vue

@@ -36,9 +36,13 @@
 						url: '/static/index/refund.png'
 					},
 					{
-						name: '审核查询',
-						url: '/static/index/audit.png'
+						name: '订单管理',
+						url: '/static/index/indent.png'
 					},
+					// {
+					// 	name: '审核查询',
+					// 	url: '/static/index/audit.png'
+					// },
 					{
 						name: '商品管理',
 						url: '/static/index/product.png'
@@ -83,6 +87,11 @@
 						url: '/pages/store/settings'
 					})
 				}
+				// if (item.name == '审核查询') {
+				// 	uni.navigateTo({
+				// 		url: '/pages/store/examine'
+				// 	})
+				// }
 				
 			}
 		}

pages.json

@@ -287,7 +287,11 @@
 		{
 			"path": "pages/store/editStore",
 			"style": {}
+		},{
+			"path": "pages/store/examine",
+			"style": {}
 		}
+		
 
 	],
 	"globalStyle": {

pages/index/full.vue

@@ -80,10 +80,11 @@
 						url: '/static/index/audit.png'
 					},
 				],
-				order: [{
-						name: '订单管理',
-						url: '/static/index/indent.png'
-					},
+				order: [
+					// {
+					// 	name: '订单管理',
+					// 	url: '/static/index/indent.png'
+					// },
 					{
 						name: '核销记录',
 						url: '/static/index/history.png'

pages/login/login.vue

@@ -81,7 +81,7 @@ export default {
 			checked: [],
 			shape: '',//round 圆形
 			loading: false,
-			userName: '18956455265',
+			userName: '15513573860',
 			password: '123456',
 			phoneNo: '',
 			smsCode: '',
@@ -154,7 +154,8 @@ export default {
 			}
 			let loginParams = {
 				phone: this.userName,
-				passWord: this.password
+				passWord: this.password,
+				userType:'2'
 			}
 			this.loading = true;
 

pages/login/register.vue

@@ -156,7 +156,9 @@
 			        }
 			        let loginParams = {
 						phone:this.userName,
-						passWord:this.password
+						passWord:this.password,
+				userType:'2'
+
 			        }
 					this.loading=true;
 				

pages/login/settled.vue

@@ -256,14 +256,14 @@
                     <view class="customize">
                         <view class="title">门头照片</view>
                         <view class="grid col-3 grid-square flex-sub booder-top">
-                            <view class="bg-img" v-for="(item, index) in form.headPhoto" :key="index" @tap="ViewImage"
-                                :data-url="form.headPhoto[index]">
-                                <image :src="form.headPhoto[index]" mode="aspectFill"></image>
+                            <view class="bg-img" v-for="(item, index) in headPhotoImg" :key="index" @tap="ViewImage"
+                                :data-url="headPhotoImg[index]">
+                                <image :src="headPhotoImg[index]" mode="aspectFill"></image>
                                 <view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
                                     <text class='cuIcon-close'></text>
                                 </view>
                             </view>
-                            <view class="solids" @tap="ChooseImage" v-if="form.headPhoto.length < 4">
+                            <view class="solids" @tap="ChooseImage" v-if="headPhotoImg.length<=9">
                                 <text class='cuIcon-cameraadd'></text>
                             </view>
                         </view>
@@ -346,7 +346,8 @@ export default {
             // 	longitude: 112.34988,
             // 	iconPath: '../../static/avatar_girl.png'
             // }]
-            markers: []
+            markers: [],
+            headPhotoImg:[],
 
         }
     },
@@ -367,7 +368,7 @@ export default {
                 : []
             this.businessLicenseImg = configService.apiUrl + '/' + obj.businessLicense
             this.identityOneImg = configService.apiUrl + '/' + obj.identityOne
-            obj.headPhoto=obj.headPhoto? obj.headPhoto.split(',').filter(id => id !== ''):[]
+           this.headPhotoImg=obj.headPhoto? obj.headPhoto.split(',').filter(id => id !== ''):[]
             this.form = obj
 
         }
@@ -405,10 +406,13 @@ export default {
                             success: (files) => {
                                 let data = JSON.parse(files.data);
                                 if (data.success) {
-                                    if (this.form.headPhoto.length != 0) {
+
+                                    if (this.headPhotoImg.length != 0) {
+							            this.headPhotoImg = this.headPhotoImg.concat(res.tempFilePaths)
                                         this.form.headPhoto.push(configService.apiUrl + '/' + data.message)
 
                                     } else {
+                                        this.headPhotoImg = res.tempFilePaths
                                         this.form.headPhoto = [configService.apiUrl + '/' + data.message]
 
                                     }
@@ -424,7 +428,7 @@ export default {
         },
         ViewImage(e) {
             uni.previewImage({
-                urls: this.form.headPhoto,
+                urls: this.headPhotoImg,
                 current: e.currentTarget.dataset.url
             });
         },
@@ -436,7 +440,7 @@ export default {
                 confirmText: '确定',
                 success: res => {
                     if (res.confirm) {
-                        this.form.headPhoto.splice(e.currentTarget.dataset.index, 1)
+                        this.headPhotoImg.splice(e.currentTarget.dataset.index, 1)
                         this.form.headPhoto.splice(e.currentTarget.dataset.index, 1)
 
                     }

pages/store/addHours.vue

@@ -6,49 +6,46 @@
         <view class="tab-top bg-fff">
             <view class="title ">营业日</view>
             <view style="padding-bottom:20upx;border-bottom: 1px solid #EEEEEE;">
-                <text v-for="(tag, index) in tags" :key="index" class="tag-type"
-                    :class="{ 'selected-background': isSelected(tag) }"
-                    :style="tag == '周四' || tag == '整周' ? 'margin-right:0' : ''" @click="toggleSelection(tag)">
+                <text v-for="(tag, index) in tags" :key="index" class="tag-type" :class="{
+                    'disable-background': isDisable(tag),
+                    'selected-background': isSelected(tag)
+                }" :style="tag == '周四' || tag == '整周' ? 'margin-right:0' : ''" @click="toggleSelection(tag)">
                     {{ tag }}
                 </text>
             </view>
-            <view  style="padding-top:18upx">营业时段</view>
-            <view style="border-bottom: 1upx solid #eee;margin:0" v-for="(tim,timInd) in timeArr" :key="timInd">
-                <view class="cu-form-group" style="margin:0" v-if="timInd==0 && timeArr.length<3">
+            <view style="padding-top:18upx">营业时段</view>
+            <view class="cu-form-group" style="border-bottom: 1upx solid #eee;margin:0" v-if="timeType.length > 0">
+                <input v-model="time" name="input"></input>
+            </view>
+            <view style="border-bottom: 1upx solid #eee;margin:0" v-for="(tim, timInd) in timeArr" :key="timInd" v-else>
+                <view class="cu-form-group" style="margin:0" v-if="timInd == 0 && timeArr.length < 3">
                     <input placeholder="添加营业时段（1/3）" v-model="tim.value" name="input" @click="open(timInd)"></input>
                     <view @click="add()" class="add-style">添加</view>
                 </view>
-                <view v-else >
+                <view v-else>
                     <uni-swipe-action>
-                        <uni-swipe-action-item
-                            :right-options="options2"
-                            :show="timInd.show"
-                            :auto-close="false"
-                        >
+                        <uni-swipe-action-item :right-options="options2" :show="timInd.show" :auto-close="false">
                             <view class="cu-form-group" style="margin:0">
-                                <input :placeholder='"添加营业时段（"+(timInd+1)+"/3）"' v-model="tim.value" name="input" @click="open(timInd)"></input>
-                                <text   class='cuIcon-right' style="color: #C7C6CA ;" @click="open(timInd)"></text>
+                                <input :placeholder='"添加营业时段（" + (timInd + 1) + "/3）"' v-model="tim.value" name="input"
+                                    @click="open(timInd)"></input>
+                                <text class='cuIcon-right' style="color: #C7C6CA ;" @click="open(timInd)"></text>
                             </view>
                             <template v-slot:right>
                                 <view>
-                                    <view  @click="bindClick" class="add-style" style="background: #FF6067;">删除</view>
+                                    <view @click="bindClick" class="add-style" style="background: #FF6067;">删除</view>
                                 </view>
                             </template>
                         </uni-swipe-action-item>
                     </uni-swipe-action>
                 </view>
-              
             </view>
-           
-            <view class="flex align-center justify-between date24" >
+            <view class="flex align-center justify-between date24">
                 <view>24小时营业</view>
-                <uni-data-checkbox multiple :localdata="sex" v-model="timeType" active-color="#FF852D "
-                ></uni-data-checkbox>
+                <uni-data-checkbox multiple :localdata="sex" v-model="timeType"
+                    active-color="#FF852D "></uni-data-checkbox>
             </view>
         </view>
-        <rangTime ref="rangTime"
-            :mode="mode"
-            @onSubmit="onEndTimeChange"   />
+        <rangTime ref="rangTime" :mode="mode" @onSubmit="onEndTimeChange" />
         <view class="padding flex flex-direction sub-bottom">
             <button class="cu-btn bg-blue round " @click="sumbit">提交</button>
         </view>
@@ -60,97 +57,204 @@ import { USER_INFO } from "@/common/util/constants"
 export default {
     components: {
         rangTime
-		},
+    },
     data() {
         return {
-            options2:[{
+            time: '00:00-24:00',
+            options2: [{
                 text: '删除',
                 style: {
                     backgroundColor: '#FF6067',
                     fontSize: '28upx',
                 }
-                },
+            },
             ],
-            timeArr:[{
-                value:'',
-                show:false ,
-
+            timeArr: [{
+                value: '',
+                show: false,
             }],
-            timeType:[],
+            timeType: [],
             sex: [{
-				text: '',
-				value: 1
-			}],
+                text: '',
+                value: 1
+            }],
             mode: 6,
-            corporateName:'',
-            tags: ['周一', '周二', '周三', '周四', '周五', '周六', '周日', '整周'], // 你的标签数组
+            corporateName: '',
+            tags: ['周一', '周二', '周三', '周四', '周五', '周六', '周日', '整周'], // 标签数组
             selectedIndices: [], // 用于存储被选中的标签索引
+            disableIndices: [], // 用于存储被禁用的标签索引
             timeIndex: '',
             merchantId: '',
-
+            arrData:[],//传参进来的数组
         }
     },
-    async onLoad() {
+    async onLoad(data) {
         this.merchantId = uni.getStorageSync(USER_INFO).merchantId;
+        if (data.params) {
+            let obj = JSON.parse(decodeURIComponent(data.params));
+            this.arrData=obj
+            if ( obj.arr.length>0) {
+                this.otherProhibitions(obj.arr,obj.index)
+                obj.arr.forEach((val, index1) => {
+                    if (index1 == obj.index) {
+                        this.selectedIndices = val.period ? val.period.split('、').filter(id => id !== '') : []
+                    }
+                    this.timeType = val.timeType == '1' ? [1] : []
+                    if (val.middleTime) {
+                        this.timeArr = [
+                            {
+                                value: val.middleTime,
+                                show: false,
+                            }
+                        ]
+                    }
+                    if (val.beginTime) {
+                        this.timeArr = [
+                            {
+                                value: val.middleTime,
+                                show: false,
+                            },
+                            {
+                                value: val.beginTime,
+                                show: false,
+                            }
+                        ]
+                    }
+                    if (val.endTime) {
+                        this.timeArr = [
+                            {
+                                value: val.middleTime,
+                                show: false,
+                            },
+                            {
+                                value: val.beginTime,
+                                show: false,
+                            },
+                            {
+                                value: val.endTime,
+                                show: false,
+                            }
+                        ]
+                    }
+                })
+            }
+           
+        }
+
     },
     methods: {
-        open(index){
-            this.timeIndex=index
+        open(index) {
+            this.timeIndex = index
             this.$refs.rangTime.open()
         },
-       
-        bindClick(e){
+        // 选择整周其他所有禁用
+        otherProhibitions(arr,index){
+            if(arr.length==2){
+                let adjacentObj=arr.find((_, i) => i !== index)
+                this.disableIndices = adjacentObj.period? adjacentObj.period.split('、').filter(id => id !== ''):
+                adjacentObj.period==['整周']?this.tags: []
+            }
+            else if(arr.length==1){
+
+                this.disableIndices =  arr[0].period=='整周'? 
+                this.tags:arr[0].period?
+                arr[0].period.split('、').filter(id => id !== '')
+                : []
+            console.log(this.disableIndices,22222222);
+
+            }
+            else{
+                this.disableIndices=[]
+            }
+            
+        },
+        bindClick(e) {
             this.timeArr.splice(this.timeIndex, 1);
         },
         // 检查一个标签是否被选中
         isSelected(index) {
             return this.selectedIndices.includes(index);
         },
+        // 检查一个标签是否被禁用
+        isDisable(index) {
+            return this.disableIndices.includes(index);
+        },
         // 切换标签的选中状态
         toggleSelection(index) {
+            
             const indexIndex = this.selectedIndices.indexOf(index);
+            console.log(indexIndex,89999);
+
             if (indexIndex > -1) {
+                if (index == '整周') {
+                    if(this.arrData.arr.length==1 && this.arrData.arr[0].period=='整周'){
+                        this.disableIndices=[];
+                    }
+                    else{
+                        this.otherProhibitions(this.arrData.arr,this.arrData.index)
+                    }
+                }
                 // 如果标签已经被选中，则移除它
                 this.selectedIndices.splice(indexIndex, 1);
             } else {
-                // 如果标签没有被选中，则添加它
-                this.selectedIndices.push(index);
+                if (!this.disableIndices.includes(index)) {
+                    if (index == '整周') {
+                        this.selectedIndices = []
+                        this.disableIndices.push('周一', '周二', '周三', '周四', '周五', '周六', '周日');
+                    }
+                    // 如果标签没有被选中，则添加它
+                    this.selectedIndices.push(index);
+                }
+
             }
         },
-        add(){
+        add() {
             this.timeArr.push({
-                value:'',
-                show:false ,
+                value: '',
+                show: false,
             })
         },
-        onEndTimeChange(val){
-            this.timeArr[this.timeIndex].value=val.startDate+'-'+val.endDate
-            // this.time=val.startDate+'-'+val.endDate
-            
+        onEndTimeChange(val) {
+            this.timeArr[this.timeIndex].value = val.startDate + '-' + val.endDate
+
         },
-        sumbit(){
-            let data={ 
-                merchantId: this.merchantId, 
-                timeType:this.timeType.length>0?1:0,
-                period:this.selectedIndices.length>0?this.selectedIndices.join(','):null,
-                middleTime: this.timeArr.length>=1?this.timeArr[0].value :null,
-                beginTime: this.timeArr.length>=2? this.timeArr[1].value:null,
-                endTime:this.timeArr.length>=3?  this.timeArr[2].value:null
+        sumbit() {
+            let data = {
+                merchantId: this.merchantId,
+                timeType: this.timeType.length > 0 ? 1 : 2,
+                period: this.selectedIndices.length > 0 ? this.selectedIndices.join('、') : null,
+                middleTime: this.timeArr.length >= 1 ? this.timeArr[0].value : null,
+                beginTime: this.timeArr.length >= 2 ? this.timeArr[1].value : null,
+                endTime: this.timeArr.length >= 3 ? this.timeArr[2].value : null,
+                id:this.arrData.index==1 || this.arrData.index==0?this.arrData.arr[this.arrData.index].id:null
+            }
+            if(this.selectedIndices.length==0){
+				this.$tip.toast('请选择营业日');
+                return
+            }
+            if(this.timeArr.length==0 && this.timeType.length==0){
+				this.$tip.toast('请选择营业s时段');
+                return
             }
-            console.log(data,444444444);
-            this.$http.post('/merchant/localMerchantTime/add', data).then(res => {
+            let interfaceData = data.id ? "/merchant/localMerchantTime/edit" : "/merchant/localMerchantTime/add"
+            
+            this.$http.post(interfaceData, data).then(res => {
                 if (res.data.success) {
                     this.$tip.success(res.data.result || '成功')
                     uni.navigateBack({
-                            delta: 1 // 返回的页面数，默认为1
-                        })
+                        delta: 1, // 返回的页面数，默认为1
+                        success: () => {
+                            const pages = getCurrentPages();
+                            pages[pages.length-1].$vm.$forceUpdate();
+                        }
+                    })
                 }
                 else {
                     this.$tip.error(res.data.message);
                 }
-            }) 
+            })
         },
-          
+
     }
 }
 </script>
@@ -177,6 +281,12 @@ page {
     line-height: 54upx;
 }
 
+.disable-background {
+    background: #F2F3F5;
+    border: 1px solid #D2D9DC;
+    color: #C0C0C0;
+}
+
 .selected-background {
     color: #2983EC;
     position: relative;
@@ -205,7 +315,7 @@ page {
     border-top: 1px solid #EEEEEE;
 }
 
-.add-style{
+.add-style {
     padding: 0 30upx;
     background: #449AFF;
     color: #fff;
@@ -213,13 +323,16 @@ page {
     margin-top: 22upx;
     border-radius: 4px 4px 4px 4px;
 }
-.date24{
-    line-height:80upx;
-   /deep/ .uni-data-checklist{
-    flex: none;
-    .checklist-group .checklist-box{
-        margin-right: 0;
+
+.date24 {
+    line-height: 80upx;
+
+    /deep/ .uni-data-checklist {
+        flex: none;
+
+        .checklist-group .checklist-box {
+            margin-right: 0;
+        }
     }
-   }
 }
 </style>

pages/store/businessInfor.vue

@@ -3,7 +3,8 @@
         <cu-custom bgColor="bg-fff" :isBack="true">
             <block slot="content"> 经营信息</block>
         </cu-custom>
-        <view class="progress-status" v-if="form && form.videoStatus !== null" :style="form && form.videoStatus == null ? '' : 'padding: 20upx 42upx;'">
+        <view class="progress-status" v-if="form && form.videoStatus !== null"
+            :style="form && form.videoStatus == null ? '' : 'padding: 20upx 42upx;'">
             <view v-if="form.videoStatus == 0">
                 <view class="status">
                     <image src="/static/login/status1.png" mode="aspectFit"></image>
@@ -35,10 +36,25 @@
                     </view>
                 </view>
                 <view class="customize">
-                    <image style="width: 100%;height:137upx" src="/static/store/yingyeshijian.png" mode="" @click="hoursChange()"> </image>
+                    <view class="business-hours" v-for="(val,index) in businessData" :key="val.id" @click="hoursChange(index)">
+                        <view class="flex justify-between">
+                            <text>{{ val.period }}</text>
+                            <view @click.stop="delClick(val)" class="del-style">删除</view>
+                        </view>
+                        <view class="business-date" v-if="val.timeType==1">
+                            <text>24小时营业</text>
+                        </view>
+                        <view class="business-date" v-else>
+                            <text>{{ val.middleTime }}</text>
+                            <text>{{ val.beginTime }}</text>
+                            <text>{{ val.endTime }}</text>
+                        </view>
+                    </view>
+                    <image v-if="businessData.length!==2" style="width: 100%;height:137upx" src="/static/store/yingyeshijian.png" mode=""
+                        @click="hoursChange()"> </image>
                 </view>
             </view>
-            <view class="borderRadiu" >
+            <view class="borderRadiu">
                 <view class=" cu-form-group margin-top1 justify-between">
                     <view class="content ">
                         <text class="text-bold">经营信息</text>
@@ -51,12 +67,13 @@
                         <view class="business-img ">
                             <view class="uni-uploader__file" v-if="video">
                                 <view class="uploader_video">
-                                    <uni-icons class="icon iconfont icon-cuo"  type="trash-filled" size="20" @tap="delectVideo"></uni-icons>
+                                    <uni-icons class="icon iconfont icon-cuo" type="trash-filled" size="20"
+                                        @tap="delectVideo"></uni-icons>
                                     <video :src="video" class="video-container"></video>
                                 </view>
                             </view>
                             <image v-else src="/static/store/upload2.png" mode="" @tap="chooseVideo()"></image>
-                           
+
                         </view>
                     </view>
                     <view class="business-prompt">
@@ -98,7 +115,7 @@ export default {
             video: '',
             photoList: [],
             form: {},
-            src:'',
+            src: '',
             cameraList: [{
                 value: 'back',
                 name: '后置摄像头',
@@ -108,37 +125,42 @@ export default {
                 value: 'front',
                 name: '前置摄像头'
             },
-        ],
+            ],
+            businessData: []
         }
     },
     async onLoad(data) {
         if (data.params) {
             let obj = JSON.parse(decodeURIComponent(data.params));
-            this.video = obj.video?obj.video:''
-            obj.photo=obj.photo?  obj.photo.split(',').filter(id => id !== ''):[]
+            this.video = obj.video ? obj.video : ''
+            obj.photo = obj.photo ? obj.photo.split(',').filter(id => id !== '') : []
             this.form = obj
         }
-        this.$http.get('/merchant/localMerchantTime/queryById?id='+ this.form.id).then(res => {
-            if (res.data.success) {
-               
-            }
-            else {
-                this.$tip.error(res.data.message);
-            }
-        }) 
+
+    },
+    async onShow() {
+        let res = await this.$http.get('/merchant/localMerchantTime/list?merchantId=' + uni.getStorageSync(USER_INFO).merchantId,)
+        if (res.data.success) {
+            this.businessData = res.data.result
+        }
+        else {
+            this.$tip.error(res.data.message);
+        }
     },
     methods: {
-        hoursChange(){
+        hoursChange(index) {
+            const queryString = encodeURIComponent(JSON.stringify({index,arr:this.businessData}))
             uni.navigateTo({
-                url: '/pages/store/addHours'
+                url: `/pages/store/addHours?params=${queryString}`
             })
+
         },
-        delectVideo(){
+        delectVideo() {
             uni.showModal({
-                title:"提示",
-                content:"是否要删除此视频",
-                success:(res) =>{
-                    if(res.confirm){
+                title: "提示",
+                content: "是否要删除此视频",
+                success: (res) => {
+                    if (res.confirm) {
                         this.video = ''
                     }
                 }
@@ -179,11 +201,11 @@ export default {
                                 if (data.success) {
                                     if (this.form.photo.length != 0) {
                                         // this.photoList = this.photoList.concat(res.tempFilePaths)
-                                        this.form.photo.push(configService.apiUrl + '/' +data.message)
-                                        
+                                        this.form.photo.push(configService.apiUrl + '/' + data.message)
+
                                     } else {
                                         // this.photoList =res.tempFilePaths
-                                        this.form.photo = [configService.apiUrl + '/' +data.message]
+                                        this.form.photo = [configService.apiUrl + '/' + data.message]
                                     }
                                 }
                             }
@@ -199,21 +221,21 @@ export default {
                 current: e.currentTarget.dataset.url
             });
         },
-        chooseVideo(){
-                // 上传视频
-                console.log('上传视频')
-                uni.chooseVideo({
-                    sourceType: ['camera', 'album'],
-                    success: (res) => {
-                        this.video = res.tempFilePath;
-                    }
-                })
-            },
+        chooseVideo() {
+            // 上传视频
+            console.log('上传视频')
+            uni.chooseVideo({
+                sourceType: ['camera', 'album'],
+                success: (res) => {
+                    this.video = res.tempFilePath;
+                }
+            })
+        },
         sumbit() {
             let data = {
                 merchantId: uni.getStorageSync(USER_INFO).merchantId,
                 video: this.video,
-                photo:this.form.photo.join(",")
+                photo: this.form.photo.join(",")
             }
             if (this.form.videoStatus == null) {
                 this.$http.post('/merchant/LocalMerchantOperate/add', data).then(res => {
@@ -242,6 +264,25 @@ export default {
                 })
             }
 
+        },
+        delClick(val){
+            this.$http.delete('/merchant/localMerchantTime/delete?id='+val.id).then(res => {
+                if (res.data.success) {
+                    this.$tip.success(res.data.result || '成功')
+                    this.$http.get('/merchant/localMerchantTime/list?merchantId=' + uni.getStorageSync(USER_INFO).merchantId).then(res=>{
+                    if (res.data.success) {
+                        this.businessData = res.data.result
+                    }
+                    else {
+                        this.$tip.error(res.data.message);
+                    }
+                })
+
+                }
+                else {
+                    this.$tip.error(res.data.message);
+                }
+            })
         }
     }
 }
@@ -283,6 +324,7 @@ page {
 .borderRadiu {
     border-radius: 8px;
     background-color: #ffffff;
+
     .customize {
         padding: 0 18upx 18upx;
 
@@ -314,18 +356,23 @@ page {
 .booder-top {
     border-bottom: 1px solid rgb(238, 238, 238);
     padding-bottom: 7px;
-    .uploader_video{
-        width: 310upx ;
+
+    .uploader_video {
+        width: 310upx;
         height: 210upx;
     }
-    .video-container{
-        max-width: 100%; /* 最大宽度为父容器宽度 */
-        max-height: 100%; 
-        /deep/.uni-video-bar{
+
+    .video-container {
+        max-width: 100%;
+        /* 最大宽度为父容器宽度 */
+        max-height: 100%;
+
+        /deep/.uni-video-bar {
             height: 62upx;
-            padding:0
-        }   
+            padding: 0
+        }
     }
+
     // /deep/ video{
     //     position: relative;
     //     z-index: 1;
@@ -344,11 +391,14 @@ page {
     background: #FFFFFF;
     border-top: 1px solid #EEEEEE;
 }
+
 .uni-uploader__img {
     width: 200upx;
     height: 200upx;
 }
-.uni-uploader__file,.uploader_video{
+
+.uni-uploader__file,
+.uploader_video {
     position: relative;
     z-index: 1;
     width: 200upx;
@@ -359,10 +409,37 @@ page {
     position: absolute;
     right: 0;
     top: 5upx;
-    
+
     color: #FFFFFF;
     z-index: 999;
     border-top-right-radius: 20upx;
     border-bottom-left-radius: 20upx;
 }
+
+.business-hours {
+    padding: 27upx 22upx;
+    background: #F7F8FC;
+    font-size: 28upx;
+    border-radius: 8px 8px 8px 8px;
+    margin-bottom: 18upx;
+}
+
+.del-style {
+    // padding: 0 30upx;
+    width: 116upx;
+    background: #FFFFFF;
+    border-radius: 4px 4px 4px 4px;
+    border: 1px solid #EEEEEE;
+    color: #333333;
+    font-size: 26upx;
+    line-height: 50upx;
+    text-align: center;
+    // -radius: 4px 4px 4px 4px;
+}
+
+.business-date {
+    text {
+        margin-right: 22upx;
+    }
+}
 </style>

pages/store/examine.vue

@@ -3,6 +3,205 @@
         <cu-custom bgColor="bg-gradual-blue1" :isBack="true">
             <block slot="content">审核查询</block>
         </cu-custom>
-
+        <view class="eamine-tab flex justify-between">
+            <text class="tab-title" v-for="(val, index) in tabData" :key="val" :class="{
+                'selected-background': current === index
+            }" @tap="toggleSelection(index)">{{ val }}
+            </text>
+        </view>
+        <mescroll-uni ref="mescrollRef" :top="top" @init="mescrollInit" @down="downCallback" @up="upCallback">
+            <view class=" borderRadiu" v-for="(item, index) in msgList" :key="index">
+                <view class="flex justify-between green-bg " style="padding:14upx 18upx;">
+                    <view class="status-title">
+                        <text class="green-button">{{
+                            item.status == 0 ? '待审核' : item.status == 1 ? '审核通过' :item.status==2?'审核驳回':'' }}</text>
+                        <text>基础信息</text>
+                    </view>
+                    <text>{{ 
+                        item.updateTime? item.updateTime:item.createTime }}</text>
+                </view>
+                <view style="padding:10upx 18upx">
+                    <view>提交信息：</view>
+                    <view style="margin-top: 9upx;">门店，门店名称，门店地址，门店面积，门店照片，地理...</view>
+                </view>
+            </view>
+        </mescroll-uni>
     </view>
-</template>
+</template>
+<script>
+import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
+import { USER_INFO } from "@/common/util/constants"
+export default {
+    mixins: [MescrollMixin], // 使用mixin
+    computed: {
+        top() {
+            return this.CustomBar * 2 + 95
+        },
+        style() {
+            var StatusBar = this.StatusBar;
+            var CustomBar = this.CustomBar;
+            var style = `height:${CustomBar}px;padding-top:${StatusBar}upx;`;
+            return style
+        },
+    },
+    data() {
+        return {
+
+            tabData: ['基础信息', '品牌信息', '经营资质', '经营信息'],
+            current: 0,
+            msgList: [], //列表数据
+            upOption: {
+                page: {
+                    num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+                    size: 10 // 每页数据的数量
+                },
+                noMoreSize: 4, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
+                empty: {
+                    tip: '~ 暂无数据 ~', // 提示
+
+                },
+                loading: '',
+                text: '全部',
+                isShowNoMore: false,
+                textNoMore: '我是有底线的 >_<'
+            },
+            announcement: [],
+
+        }
+    },
+    onLoad() {
+        if (this.mescroll) {
+            this.mescroll.resetUpScroll()
+        }
+    },
+    methods: {
+        upCallback(page) {
+            let data = {
+                category:  this.current !==0?this.current + 1:null,
+                merchantId: uni.getStorageSync(USER_INFO).merchantId,
+                pageNo: page.num,
+                pageSize: page.size,
+            }
+            let interfaceData = this.current ==0 ? "/merchant/localMerchantService/queryList" : "/merchant/localMerchantService/queryAllList"
+
+            this.$http.post(interfaceData, data).then(res => {
+                if (res.data.success) {
+                    console.log(res.data.result.records, 888);
+
+                    this.announcement = res.data.result.records
+                    this.mescroll.endSuccess(this.announcement.length);
+
+                    for (let item of this.announcement) {
+                        this.msgList.push(item)
+                    }
+                    console.log(this.msgList, 88888);
+
+                }
+                if (page.num == 1) {
+                    this.msgList = []; //如果是第一页需手动制空列表
+                    this.msgList = this.msgList.concat(this.announcement); //追加新数据
+                }
+
+            }).catch(() => {
+                //联网失败, 结束加载
+                this.mescroll.endErr();
+            })
+
+        },
+
+        // 切换标签的选中状态
+        toggleSelection(index) {
+            if (this.current === index) return
+            this.current = index
+            this.msgList = []// 先置空列表,显示加载进度
+            this.mescroll.resetUpScroll() // 再刷新列表数据
+        },
+    }
+}
+</script>
+<style scoped lang="scss">
+page {
+    background: #F8F8FA;
+}
+
+.eamine-tab {
+    position: fixed;
+    height: 85upx;
+    width: 100%;
+    z-index: 9999;
+    background: #FFFFFF;
+    padding: 18upx 26upx;
+
+    .tab-title {
+        font-size: 28upx;
+        color: #888888;
+    }
+
+    .selected-background {
+        font-weight: 700;
+        font-size: 29upx;
+        color: #333333;
+        position: relative;
+    }
+
+    .selected-background ::after {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: 23upx;
+        width: 55upx;
+        height: 10upx;
+        background: #449AFF;
+        border-radius: 7upx;
+    }
+
+
+}
+
+.tab-top {
+    margin-top: 85upx;
+    padding: 26upx;
+}
+
+.borderRadiu {
+    border-radius: 10upx 10upx 10upx 10upx;
+    padding-bottom: 10px;
+    background-color: #ffffff;
+    font-size: 26upx;
+    color: #999999;
+    margin: 26upx;
+
+    .status-title {
+        text:first-child {
+            color: #FFFFFF;
+            padding: 8upx 14upx;
+            border-radius: 4px 4px 4px 4px;
+            margin-right: 14upx;
+        }
+    }
+
+    .green-bg {
+        background: linear-gradient(90deg, #FFFFFF 0%, #EDFCF3 100%);
+    }
+
+    .green-button {
+        background: #54C666;
+    }
+
+    .blue-bg {
+        background: linear-gradient(90deg, #FFFFFF 0%, #EBEEF6 100%);
+    }
+
+    .blue-button {
+        background: #6E78A6;
+    }
+
+    .red-bg {
+        background: linear-gradient(90deg, #FFFFFF 0%, #FFF7F8 100%);
+    }
+
+    .red-button {
+        background: #F55D65;
+    }
+}
+</style>

pages/store/settings.vue

@@ -165,7 +165,6 @@ export default {
             if (item.label == '服务设施') {
                 this.$refs.popup.open()
                 this.selectedIndices=[...this.selectTags]
-                
             }