商家入驻列表

src/pages/order/remark.vue

@@ -24,19 +24,19 @@
           prop="evaluation"
           v-model="formdata.evaluation"
           placeholder="亲，分享您的看法，给其他人一个参考哦！"
-          :rules="[{ required: true, message: '请填写你的评价' }]"
         />
         <text class="textarea">上传图片/视频</text>
-        <wd-upload
-          prop="images"
-          class="wdUpload"
-          multiple
-          :action="action"
-          @change="handleFile"
-          :file-list="fileList"
-          :before-remove="beforeRemove"
-          :header="headers"
-        ></wd-upload>
+        <view class="wdUpload" prop="images">
+          <wd-upload
+            multiple
+            :action="action"
+            @change="handleFile"
+            :file-list="formdata.images"
+            :before-remove="beforeRemove"
+            :header="headers"
+          ></wd-upload>
+        </view>
+
         <wd-cell title="匿名评价" prop="isAnonymous" class="itemSwichval">
           <wd-switch
             size="48rpx"
@@ -94,12 +94,7 @@ const formdata = reactive<{
   isAnonymous: 0,
   merchantServices: 0,
 });
-const rules = {
-  // evaluation: [
-  //   { required: true, message: '请填写你的评价' },
-  //   { type: 'array', min: 1, message: '请上传图片/视频' },
-  // ],
-};
+const rules = {};
 /**
  * 显示推荐菜
  */
@@ -125,6 +120,7 @@ const handlemerchant = (item: { value: number }) => {
  */
 const fileList = ref<any[]>([]);
 function handleFile({ fileList: files }) {
+  console.log('fileList', formdata.images);
   fileList.value = files;
 }
 /**
@@ -154,7 +150,7 @@ const deleteImg = () => {
 const handleSubmit = async () => {
   await evaluation({
     ...formdata,
-    images: proImage(),
+    // images: proImage(),
   });
   xma.showToast({
     title: '评价成功',

src/pages/storeEntry/index.vue

@@ -9,39 +9,36 @@
           <!-- 列表头部 -->
           <view class="titlecon">
             <span>{{ item.shopName }}</span>
-            <span>未通过</span>
+            <span>{{ item.shopStatus }}</span>
           </view>
           <!-- 列表详细 -->
           <view class="delbox">
             <view class="listPic">
-              <img
-                src="https://www.gywb.cn/upload/web/dataset/2024/08/01/2282c5c7e93b42c88dcfc606440f9716.jpg"
-                alt=""
-              />
+              <img :src="item.shopLogo" />
             </view>
 
             <view class="deltxt">
               <ul>
                 <li>
                   <span>申请时间：</span>
-                  <span>2024-08-02 16：21：19</span>
+                  <span>{{ item.createTime }}</span>
                 </li>
                 <li>
                   <span>签约时间：</span>
-                  <span>2024-08-02 ~ 2024-08-02</span>
+                  <span>{{ item.contractStartTime }} ~ {{ item.contractEndTime }}</span>
                 </li>
                 <li>
                   <span>地址:</span>
-                  <span>贵州省贵阳市南明区彭家湾花果园项目M区3栋1单元25层5号房</span>
+                  <span>{{ item.shopAddress }}</span>
                 </li>
               </ul>
             </view>
           </view>
         </view>
       </view>
-      <view class="shbox">审核被拒可点击修改重新提交</view>
+      <view class="shbox" v-if="list.length > 0">审核被拒可点击修改重新提交</view>
     </view>
-    <view class="butCon"><button class="butXz">主要按钮</button></view>
+    <view class="butCon"><button class="butXz" @click="shopGto">申请入驻</button></view>
   </view>
 </template>
 
@@ -50,9 +47,18 @@ import Header from '@/pages/order/components/Header/index.vue';
 import { shopList } from '@/api/storeEntry';
 const list = ref([]);
 const getList = async () => {
-  const res = await shopList();
-  list.value = res.data;
+  const { data: res } = await shopList();
   console.log(res);
+  if (res.length > 0) {
+    list.value = res;
+  } else {
+    // shopGto();
+  }
+};
+const shopGto = () => {
+  xma.redirectTo({
+    url: `/pages/storeEntry/detail`,
+  });
 };
 getList();
 </script>
@@ -63,7 +69,8 @@ getList();
   width: 375 * 2rpx;
   margin: 0 auto;
   background: #f1f1f1;
-  padding-bottom: 80px;
+  padding-bottom: 160rpx;
+  min-height: calc(100vh - 160rpx);
 
   .content {
     padding-top: 88rpx;