diff --git a/src/pages/home.vue b/src/pages/home.vue
index 882f169..99db33a 100644
--- a/src/pages/home.vue
+++ b/src/pages/home.vue
@@ -61,7 +61,7 @@ export default {
     ...mapActions(['getUserInfo', 'autoLogin']),
     handleLogin() {
       if (!this.token) {
-        this.autoLogin();
+        this.autoLogin({loginWay: ''});
       } else this.$u.toast("已登录,无需重新登录!")
     },
     handleAdminLogin({detail: {code: phoneCode}}) {
diff --git a/src/project/fengdu/AppMine/AppMine.vue b/src/project/fengdu/AppMine/AppMine.vue
index 5ec2e86..ef0f1f5 100644
--- a/src/project/fengdu/AppMine/AppMine.vue
+++ b/src/project/fengdu/AppMine/AppMine.vue
@@ -103,7 +103,7 @@ export default {
             type: 'token'
           },
           {
-            icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png",
+            icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodemendian.png",
             label: "我的门店",
             path: "./myStoreList",
             type: 'token'
diff --git a/src/project/fengdu/AppMine/myStoreList.vue b/src/project/fengdu/AppMine/myStoreList.vue
index b20e84e..3e30030 100644
--- a/src/project/fengdu/AppMine/myStoreList.vue
+++ b/src/project/fengdu/AppMine/myStoreList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="myStoreList">
-    <div class="item">
+    <div class="item" @click="toStoreForm">
       <div class="top-flex">
         <div class="name">小荣超市11111</div>
         <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
@@ -28,7 +28,9 @@ export default {
     }
   },
   methods: {
-
+    toStoreForm() {
+      uni.navigateTo({url: './storeForm'})
+    }
   },
 
 }
diff --git a/src/project/fengdu/AppStore/AppStore.vue b/src/project/fengdu/AppStore/AppStore.vue
index fa9f76d..d23b130 100644
--- a/src/project/fengdu/AppStore/AppStore.vue
+++ b/src/project/fengdu/AppStore/AppStore.vue
@@ -4,8 +4,8 @@
       <u-tabs :list="tabList" :is-scroll="false" :current="tabIndex" @change="change" inactive-color="#222" active-color="#222" 
       height="100" :bar-style="barStyle"></u-tabs>
     </div>
-    <Situation v-if="tabIndex != 1"></Situation>
-    <Evaluate v-else></Evaluate>
+    <Situation v-if="tabIndex != 1" @toStoreDetail="toStoreDetail"></Situation>
+    <Evaluate v-else @toEvaluateForm="toEvaluateForm" @toStoreDetail="toStoreDetail"></Evaluate>
   </div>
 </template>
 
@@ -29,10 +29,20 @@ export default {
       }
     }
   },
+  onLoad() {
+  },
   methods: {
     change(e) {
       this.tabIndex = e
-    }
+    },
+    toEvaluateForm(e) {
+      console.log(e)
+      uni.navigateTo({url: './EvaluateForm'})
+    },
+    toStoreDetail(e) {
+      console.log(e)
+      uni.navigateTo({url: './StoreDetail'})
+    },
   },
 
 }
diff --git a/src/project/fengdu/AppStore/EvaluateForm.vue b/src/project/fengdu/AppStore/EvaluateForm.vue
index 74cfb18..4359091 100644
--- a/src/project/fengdu/AppStore/EvaluateForm.vue
+++ b/src/project/fengdu/AppStore/EvaluateForm.vue
@@ -3,7 +3,7 @@
     <div class="header-info">
       <div class="name">小荣超市11111</div>
       <div class="time">
-        <u-icon name="clock" color="#000" size="24"></u-icon> 评价时间：2024.06.01
+        <u-icon name="clock" color="#000" size="32"></u-icon> 评价时间：2024.06.01
       </div>
       <div class="flex-info">
         <div class="flex-item item-user">
@@ -29,27 +29,27 @@
       <div class="item">
         <div class="label">(1)、门店整洁美观</div>
         <div class="value">
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-yes">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-xz.png" alt="" class="img-yes">
           是
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-no">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-wxz.png" alt="" class="img-no">
           否
         </div>
       </div>
       <div class="item">
         <div class="label">(2)、有绿植安放</div>
         <div class="value">
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-yes">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-xz.png" alt="" class="img-yes">
           是
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-no">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-wxz.png" alt="" class="img-no">
           否
         </div>
       </div>
       <div class="item">
         <div class="label">(3)、其他</div>
         <div class="value">
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-yes">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-xz.png" alt="" class="img-yes">
           是
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-no">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-wxz.png" alt="" class="img-no">
           否
         </div>
       </div>
@@ -57,36 +57,36 @@
       <div class="item">
         <div class="label">(1)、车辆乱停</div>
         <div class="value">
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-yes">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-xz.png" alt="" class="img-yes">
           是
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-no">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-wxz.png" alt="" class="img-no">
           否
         </div>
       </div>
       <div class="item">
         <div class="label">(2)、门头凌乱</div>
         <div class="value">
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-yes">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-xz.png" alt="" class="img-yes">
           是
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-no">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-wxz.png" alt="" class="img-no">
           否
         </div>
       </div>
       <div class="item">
         <div class="label">(3)、垃圾凌乱</div>
         <div class="value">
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-yes">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-xz.png" alt="" class="img-yes">
           是
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-no">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-wxz.png" alt="" class="img-no">
           否
         </div>
       </div>
       <div class="item">
         <div class="label">(4)、其他</div>
         <div class="value">
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-yes">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-xz.png" alt="" class="img-yes">
           是
-          <img src="https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png" alt="" class="img-no">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-wxz.png" alt="" class="img-no">
           否
         </div>
       </div>
@@ -138,8 +138,8 @@ export default {
     padding: 36px 32px 32px;
     box-sizing: border-box;
     color: #323233;
-    background-image: url("https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png");
-    background-size: 100vw;
+    background-image: url("https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-headerBg.png");
+    background-size: cover;
     background-repeat: no-repeat;
     .name {
       font-family: PingFangSC-SNaNpxibold;
diff --git a/src/project/fengdu/AppStore/StoreDetail.vue b/src/project/fengdu/AppStore/StoreDetail.vue
index d16b195..a938789 100644
--- a/src/project/fengdu/AppStore/StoreDetail.vue
+++ b/src/project/fengdu/AppStore/StoreDetail.vue
@@ -11,8 +11,8 @@
             <u-icon name="star-fill" color="#FF8C19" size="24"></u-icon>
             <u-icon name="star-fill" color="#F0F0F0" size="24"></u-icon>
             <span class="star-num">4.8</span>
-            <div class="right-btn">
-              <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">评价
+            <div class="right-btn" @click="toEvaluateForm">
+              <img src="https://cdn.cunwuyun.cn/wechat/fd-store/store-detail-edit-icon.png" alt="">评价
             </div>
           </div>
         </div>
@@ -78,7 +78,11 @@ export default {
 
     }
   },
-  methods: {},
+  methods: {
+    toEvaluateForm() {
+      uni.navigateTo({url: './EvaluateForm'})
+    }
+  },
 
 }
 </script>
@@ -88,10 +92,10 @@ export default {
   background-color: #fff;
   .header-info {
     width: 100%;
-    height: 380px;
+    // height: 390px;
     padding: 40px 32px 32px 32px;
     box-sizing: border-box;
-    background-image: url("https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png");
+    background-image: url("https://cdn.cunwuyun.cn/wechat/fd-store/store-detail-headerBg.png");
     background-size: 100vw;
     background-repeat: no-repeat;
     .flex-top {
@@ -133,9 +137,10 @@ export default {
             margin-left: 32px;
             vertical-align: bottom;
             img {
-              width: 20px;
-              height: 20px;
-              margin-right: 8px;
+              width: 28px;
+              height: 28px;
+              margin-right: 4px;
+              vertical-align: text-bottom;
             }
           }
         }
diff --git a/src/project/fengdu/AppStore/components/Evaluate.vue b/src/project/fengdu/AppStore/components/Evaluate.vue
index d13501d..32b9e5a 100644
--- a/src/project/fengdu/AppStore/components/Evaluate.vue
+++ b/src/project/fengdu/AppStore/components/Evaluate.vue
@@ -21,13 +21,13 @@
         </div>
       </div>
       <div class="list-content">
-        <div class="item">
+        <div class="item" @click="toStoreDetail">
           <div class="left">
             <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
           </div>
           <div class="right">
-            <div class="right-btn">
-              <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">评价
+            <div class="right-btn" @click="toEvaluateForm">
+              <img src="https://cdn.cunwuyun.cn/wechat/fd-store/store-detail-edit-icon.png" alt="">评价
             </div>
             <div class="store-name">小荣超市</div>
             <div class="star-info">
@@ -68,11 +68,37 @@ export default {
   appName: '我要评价',
   data() {
     return {
+      list: [],
+      current: 1,
+      pages: 2,
       searchVal: '',
       gridName: ''
     }
   },
+  created() {
+    console.log(44)
+    this.getList()
+  },
+  onLoad() {
+    console.log(33)
+    this.getList()
+  },
   methods: {
+    getList() {
+      console.log(122)
+      if(this.current > this.pages) return
+      this.$loading()
+      this.$instance.post(`/app/appshopassess/list`, null, {
+        params: {
+          current: this.current, size: 15
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.list = this.current == 1 ? list : [this.list, list].flat()
+          this.pages = res.data.total
+        }
+      }).finally(() => uni.hideLoading())
+    },
     getSearchList() {
 
     },
@@ -84,6 +110,12 @@ export default {
       // this.search.girdId = e?.id
       // this.getDatas()
     },
+    toEvaluateForm() {
+      this.$emit('toEvaluateForm', {id: '123'})
+    },
+    toStoreDetail() {
+      this.$emit('toStoreDetail', {id: '123'})
+    }
   },
 
 }
@@ -156,9 +188,10 @@ export default {
           font-size: 24px;
           color: #FFF;
           img {
-            width: 20px;
-            height: 20px;
-            margin-right: 8px;
+            width: 28px;
+            height: 28px;
+            margin-right: 4px;
+            vertical-align: text-bottom;
           }
         }
         .store-name {
diff --git a/src/project/fengdu/AppStore/components/Situation.vue b/src/project/fengdu/AppStore/components/Situation.vue
index c6690ee..ec80abf 100644
--- a/src/project/fengdu/AppStore/components/Situation.vue
+++ b/src/project/fengdu/AppStore/components/Situation.vue
@@ -6,7 +6,7 @@
     <div class="flex-content">
       <div class="item">
         <div class="left">
-          <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/situation-mdzsl.png" alt="">
         </div>
         <div class="right">
           <p>门店总数量</p>
@@ -15,7 +15,7 @@
       </div>
       <div class="item">
         <div class="left">
-          <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/situation-mdzrs.png" alt="">
         </div>
         <div class="right">
           <p>门店总人数</p>
@@ -24,7 +24,7 @@
       </div>
       <div class="item">
         <div class="left">
-          <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/situation-zwgs.png" alt="">
         </div>
         <div class="right">
           <p>总网格数</p>
@@ -33,7 +33,7 @@
       </div>
       <div class="item">
         <div class="left">
-          <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+          <img src="https://cdn.cunwuyun.cn/wechat/fd-store/situation-zwgy.png" alt="">
         </div>
         <div class="right">
           <p>总网格员</p>
@@ -55,9 +55,9 @@
       <div class="cell cell-th">
         <span class="store-name">门店名称</span>
         <span class="user-name">经营者姓名</span>
-        <span class="user-name">经营者姓名</span>
+        <span class="user-name">经营类型</span>
       </div>
-      <div class="cell">
+      <div class="cell" @click="toStoreDetail">
         <span class="store-name">小荣超市</span>
         <span class="user-name">小荣</span>
         <span class="user-name">小荣</span>
@@ -75,6 +75,9 @@ export default {
     return {
       girdName: ''
     }
+  },
+  onShow() {
+
   },
   methods: {
     handleGridSelect(e) {
@@ -82,6 +85,9 @@ export default {
       // this.search.girdId = e?.id
       // this.getDatas()
     },
+    toStoreDetail() {
+      this.$emit('toStoreDetail', {id: '123'})
+    }
   },
 
 }
diff --git a/src/project/fengdu/AppStore/store.png b/src/project/fengdu/AppStore/store.png
new file mode 100644
index 0000000..676a344
Binary files /dev/null and b/src/project/fengdu/AppStore/store.png differ
diff --git a/src/project/fengdu/AppStore/store_selected.png b/src/project/fengdu/AppStore/store_selected.png
new file mode 100644
index 0000000..9e1facf
Binary files /dev/null and b/src/project/fengdu/AppStore/store_selected.png differ