diff --git a/src/project/fengdu/AppMine/AppMine.vue b/src/project/fengdu/AppMine/AppMine.vue
index ef0f1f5..9af8663 100644
--- a/src/project/fengdu/AppMine/AppMine.vue
+++ b/src/project/fengdu/AppMine/AppMine.vue
@@ -106,7 +106,13 @@ export default {
             icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodemendian.png",
             label: "我的门店",
             path: "./myStoreList",
-            type: 'token'
+            type: 'idNumber'
+          },
+          {
+            icon: "https://cdn.cunwuyun.cn/wechat/biaopin/mine/mine-icon-sys.png",
+            label: "扫一扫",
+            path: "./myHarvestQR",
+            type: 'scan'
           },
         ],
         // [
@@ -162,6 +168,9 @@ export default {
               this.$linkTo(url)
             }
           }
+          if (type == 'scan') {
+            this.scan()
+          }
           if (type == 'null') {
             this.$u.toast('内容建设中...')
           }
diff --git a/src/project/fengdu/AppStore/AppStore.vue b/src/project/fengdu/AppStore/AppStore.vue
index d988ad8..5802137 100644
--- a/src/project/fengdu/AppStore/AppStore.vue
+++ b/src/project/fengdu/AppStore/AppStore.vue
@@ -52,8 +52,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+page{
+  height: 100%;
+}
 .AppStore {
   background-color: #F4F5FA;
+  height: 100vh;
   .tab {
     position: fixed;
     top: 0;
diff --git a/src/project/fengdu/AppStore/EvaluateForm.vue b/src/project/fengdu/AppStore/EvaluateForm.vue
index dcb1d93..7e61397 100644
--- a/src/project/fengdu/AppStore/EvaluateForm.vue
+++ b/src/project/fengdu/AppStore/EvaluateForm.vue
@@ -155,7 +155,7 @@ export default {
         evaluatorPhone: this.user.phone,
         evaluator: this.user.name ? this.user.name : this.user.nickName,
         evaluatorUrl: this.user.avatarUrl,
-        assessType: JSON.stringify(assessTypeList)
+        itemList: assessTypeList
       }).then(res => {
         if (res?.data) {
           this.$u.toast('提交成功')
diff --git a/src/project/fengdu/AppStore/StoreDetail.vue b/src/project/fengdu/AppStore/StoreDetail.vue
index 34fa259..e11e074 100644
--- a/src/project/fengdu/AppStore/StoreDetail.vue
+++ b/src/project/fengdu/AppStore/StoreDetail.vue
@@ -23,7 +23,7 @@
           </div>
         </div>
         <div class="right">
-          <img :src="detailInfo.fileUrl" alt="">
+          <img :src="detailInfo.fileUrl" alt="" @click="previewShopImg">
         </div>
       </div>
       <div class="address"><u-icon name="map" color="#666" size="24"></u-icon>{{ detailInfo.address }}</div>
@@ -72,7 +72,7 @@
         </div>
         <div class="text">{{ item.remark }}</div>
         <div v-if="item.imgList && item.imgList.length">
-          <img :src="img" alt="" v-for="(img, indexs) in item.imgList" :key="indexs" class="img">
+          <img :src="img" alt="" v-for="(img, indexs) in item.imgList" :key="indexs" class="img" @click="preview(item.imgList, indexs)">
         </div>
       </div>
       <AiEmpty v-if="!assessList.length" />
@@ -141,6 +141,19 @@ export default {
     },
     toEvaluateForm() {
       uni.navigateTo({url: `./EvaluateForm?shopId=${this.shopId}`})
+    },
+    preview(imgList, index) {
+      var list = []
+      imgList.map((item) => {
+        var e = {url: item}
+        list.push(e)
+      })
+      console.log(list, index)
+      this.$previewImage(list, index, url);
+    },
+    previewShopImg() {
+      var imgList = [{url: this.detailInfo.fileUrl}]
+      this.$previewImage(imgList, 0, url);
     }
   },
   onReachBottom() {
diff --git a/src/project/fengdu/AppStore/components/Situation.vue b/src/project/fengdu/AppStore/components/Situation.vue
index f8b105a..18ff7c0 100644
--- a/src/project/fengdu/AppStore/components/Situation.vue
+++ b/src/project/fengdu/AppStore/components/Situation.vue
@@ -42,11 +42,10 @@
       </div>
     </div>
     <div class="title">
-      <div class="left">6月的五星门店<span>（排名不分先后）</span></div>
+      <div class="left">{{monthText}}月的五星门店<span>（排名不分先后）</span></div>
       <div class="right">
         <AiPagePicker type="gird" @select="handleGridSelect">
-          <!-- <AiMore v-model="gridName" placeholder="请选择网格"/> -->
-          <span :style="gridName ? '': 'color:#999'" class="grid-name">{{gridName || '请选择网格'}}</span>
+          <span :style="gridName ? '': 'color:#999'" class="grid-name">{{searchGird.gridName || '请选择网格'}}</span>
           <u-icon name="arrow-down" color="#999" size="28"></u-icon>
         </AiPagePicker>
       </div>
@@ -57,10 +56,10 @@
         <span class="user-name">经营者姓名</span>
         <span class="user-name">经营类型</span>
       </div>
-      <div class="cell" @click="toStoreDetail">
-        <span class="store-name">小荣超市</span>
-        <span class="user-name">小荣</span>
-        <span class="user-name">小荣</span>
+      <div class="cell" @click="toStoreDetail(item.id)" v-for="(item, index) in table" :key="index">
+        <span class="store-name">{{ item.shopName }}</span>
+        <span class="user-name">{{ item.name }}</span>
+        <span class="user-name">{{ item.phone }}</span>
       </div>
     </div>
   </div>
@@ -73,21 +72,45 @@ export default {
   appName: '门店情况',
   data() {
     return {
-      girdName: ''
+      girdName: '',
+      searchGird: {girdName: ''},
+      month: '',
+      monthText: '',
+      table: []
     }
   },
-  onShow() {
-
+  created() {
+    const date = new Date()
+    this.monthText = date.getMonth() + 1
+    var month = date.getMonth() + 1
+    month = month > 9 ? month : "0" + month;
+    this.month = date.getFullYear() + '-' + month
+    this.getTable()
   },
   methods: {
     handleGridSelect(e) {
-      this.gridName = e?.girdName
-      // this.search.girdId = e?.id
-      // this.getDatas()
+      this.searchGird = e
+      this.getTable()
+    },
+    toStoreDetail(id) {
+      this.$emit('toStoreDetail', {shopId: id})
+    },
+    getTable() {
+      this.$loading()
+      this.$instance.post(`/app/appshoparchives/list`, null, {
+        params: {
+          current: 1,
+          size: 100,
+          fiveStartTime: this.month,
+          storeLevel: 5,
+          girdCode: this.searchGird.girdCode || ''
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.table = res.data.records 
+        }
+      }).finally(() => uni.hideLoading())
     },
-    toStoreDetail() {
-      this.$emit('toStoreDetail', {id: '123'})
-    }
   },
 
 }
@@ -119,11 +142,11 @@ export default {
     }
   }
   .flex-content {
-    padding: 0 32px;
+    padding-left: 32px;
     overflow: hidden;
     .item {
       float: left;
-      width: calc(50% - 16px);
+      width: calc(50% - 32px);
       display: flex;
       background: #FFF;
       border-radius: 12px;
@@ -168,6 +191,8 @@ export default {
     margin-left: 32px;
     background-color: #FFF;
     box-sizing: border-box;
+    max-height: calc(100% - 620px);
+    overflow-y: scroll;
     .cell {
       display: flex;
       padding: 14px 0;