From c3f80c5fa606544e91c9123978a7aa2ada938110 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 19 May 2023 15:24:09 +0800
Subject: [PATCH 1/6] bug

---
 project/fengdu/app/AppResidentInfo/components/Add.vue         | 4 ++--
 project/shuzipingchang/app/AppResidentInfo/components/Add.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/fengdu/app/AppResidentInfo/components/Add.vue b/project/fengdu/app/AppResidentInfo/components/Add.vue
index 36fed955..8f6b3120 100644
--- a/project/fengdu/app/AppResidentInfo/components/Add.vue
+++ b/project/fengdu/app/AppResidentInfo/components/Add.vue
@@ -445,14 +445,14 @@ export default {
         girdName: [
           {required: true, message: "请选择网格", trigger: "change"}
         ],
-        householdName: [
+        isHousehold: [
           {required: true, message: "请选择是否户主", trigger: "change"}
         ],
         householdRelation: [
           {required: true, message: "请选择与户主关系", trigger: "change"}
         ],
         householdIdNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
+          {required: true, message: "请输入身份证号", trigger: "blur"}
         ],
         householdAddress: [
           {required: true, message: "请选择户籍地详细地址", trigger: "blur"}
diff --git a/project/shuzipingchang/app/AppResidentInfo/components/Add.vue b/project/shuzipingchang/app/AppResidentInfo/components/Add.vue
index 36fed955..fa791e2b 100644
--- a/project/shuzipingchang/app/AppResidentInfo/components/Add.vue
+++ b/project/shuzipingchang/app/AppResidentInfo/components/Add.vue
@@ -445,14 +445,14 @@ export default {
         girdName: [
           {required: true, message: "请选择网格", trigger: "change"}
         ],
-        householdName: [
+        isHousehold: [
           {required: true, message: "请选择是否户主", trigger: "change"}
         ],
         householdRelation: [
           {required: true, message: "请选择与户主关系", trigger: "change"}
         ],
         householdIdNumber: [
-          {required: true, validator: IdNumberPass, trigger: "blur"}
+          {required: true, message: '请输入身份证号', trigger: "blur"}
         ],
         householdAddress: [
           {required: true, message: "请选择户籍地详细地址", trigger: "blur"}

From ca19697d1cdd1fc67be3237bb721c4aaef910769 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 22 May 2023 14:24:52 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppIntegratingSupermarket/components/addGoods.vue     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue b/project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue
index 60e14936..66794142 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue
@@ -42,6 +42,9 @@
             <el-form-item v-if="form.type === '1'" label="商品链接" prop="jdUrl" :rules="[{required: true, message: '请输入商品链接', trigger: 'blur'}]">
               <el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入商品链接"></el-input>
             </el-form-item>
+            <el-form-item v-if="form.type === '2'" label="小程序appid" prop="jdAppid" :rules="[{required: true, message: '请输入京东小程序appid', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.jdAppid" clearable placeholder="请输入京东小程序appid"></el-input>
+            </el-form-item>
             <el-form-item  style="width: 100%" label="商品描述" prop="description">
               <el-input type="textarea" :rows="4" size="small" v-model="form.description" clearable placeholder="请输入商品描述"></el-input>
             </el-form-item>
@@ -73,6 +76,7 @@
           title: '',
           description: '',
           jdUrl: '',
+          jdAppid: '',
           retailPrice: undefined,
           picUrl: []
         },

From 57c10378713d6b431852478eea369b9c3a44cad1 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 22 May 2023 14:42:16 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B6=85=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppIntegratingSupermarket/components/addGoods.vue     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/project/shuzipingchang/app/AppIntegratingSupermarket/components/addGoods.vue b/project/shuzipingchang/app/AppIntegratingSupermarket/components/addGoods.vue
index 60e14936..66794142 100644
--- a/project/shuzipingchang/app/AppIntegratingSupermarket/components/addGoods.vue
+++ b/project/shuzipingchang/app/AppIntegratingSupermarket/components/addGoods.vue
@@ -42,6 +42,9 @@
             <el-form-item v-if="form.type === '1'" label="商品链接" prop="jdUrl" :rules="[{required: true, message: '请输入商品链接', trigger: 'blur'}]">
               <el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入商品链接"></el-input>
             </el-form-item>
+            <el-form-item v-if="form.type === '2'" label="小程序appid" prop="jdAppid" :rules="[{required: true, message: '请输入京东小程序appid', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.jdAppid" clearable placeholder="请输入京东小程序appid"></el-input>
+            </el-form-item>
             <el-form-item  style="width: 100%" label="商品描述" prop="description">
               <el-input type="textarea" :rows="4" size="small" v-model="form.description" clearable placeholder="请输入商品描述"></el-input>
             </el-form-item>
@@ -73,6 +76,7 @@
           title: '',
           description: '',
           jdUrl: '',
+          jdAppid: '',
           retailPrice: undefined,
           picUrl: []
         },

From 291d068c66f4744fb7fdb96ad67aff7fe4aab5ae Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 22 May 2023 14:54:08 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B6=85=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppIntegratingSupermarket/components/addGoods.vue    | 9 ++++++---
 .../AppIntegratingSupermarket/components/addGoods.vue    | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue b/project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue
index 66794142..1657e8fa 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue
@@ -39,12 +39,15 @@
             <el-form-item label="零售价格" prop="retailPrice" :rules="[{required: true, message: '请输入零售价格', trigger: 'change'}]">
               <el-input-number style="width: 200px;" size="small" :precision="2" type="input" v-model="form.retailPrice" clearable placeholder="请输入零售价格" :min="0"></el-input-number>
             </el-form-item>
-            <el-form-item v-if="form.type === '1'" label="商品链接" prop="jdUrl" :rules="[{required: true, message: '请输入商品链接', trigger: 'blur'}]">
-              <el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入商品链接"></el-input>
-            </el-form-item>
             <el-form-item v-if="form.type === '2'" label="小程序appid" prop="jdAppid" :rules="[{required: true, message: '请输入京东小程序appid', trigger: 'blur'}]">
               <el-input type="input" size="small" v-model="form.jdAppid" clearable placeholder="请输入京东小程序appid"></el-input>
             </el-form-item>
+            <el-form-item v-if="form.type === '2'" label="小程序路径" prop="jdUrl" :rules="[{required: true, message: '请输入小程序路径', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入小程序路径"></el-input>
+            </el-form-item>
+            <el-form-item v-if="form.type === '1'" label="商品链接" prop="jdUrl" :rules="[{required: true, message: '请输入商品链接', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入商品链接"></el-input>
+            </el-form-item>
             <el-form-item  style="width: 100%" label="商品描述" prop="description">
               <el-input type="textarea" :rows="4" size="small" v-model="form.description" clearable placeholder="请输入商品描述"></el-input>
             </el-form-item>
diff --git a/project/shuzipingchang/app/AppIntegratingSupermarket/components/addGoods.vue b/project/shuzipingchang/app/AppIntegratingSupermarket/components/addGoods.vue
index 66794142..1657e8fa 100644
--- a/project/shuzipingchang/app/AppIntegratingSupermarket/components/addGoods.vue
+++ b/project/shuzipingchang/app/AppIntegratingSupermarket/components/addGoods.vue
@@ -39,12 +39,15 @@
             <el-form-item label="零售价格" prop="retailPrice" :rules="[{required: true, message: '请输入零售价格', trigger: 'change'}]">
               <el-input-number style="width: 200px;" size="small" :precision="2" type="input" v-model="form.retailPrice" clearable placeholder="请输入零售价格" :min="0"></el-input-number>
             </el-form-item>
-            <el-form-item v-if="form.type === '1'" label="商品链接" prop="jdUrl" :rules="[{required: true, message: '请输入商品链接', trigger: 'blur'}]">
-              <el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入商品链接"></el-input>
-            </el-form-item>
             <el-form-item v-if="form.type === '2'" label="小程序appid" prop="jdAppid" :rules="[{required: true, message: '请输入京东小程序appid', trigger: 'blur'}]">
               <el-input type="input" size="small" v-model="form.jdAppid" clearable placeholder="请输入京东小程序appid"></el-input>
             </el-form-item>
+            <el-form-item v-if="form.type === '2'" label="小程序路径" prop="jdUrl" :rules="[{required: true, message: '请输入小程序路径', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入小程序路径"></el-input>
+            </el-form-item>
+            <el-form-item v-if="form.type === '1'" label="商品链接" prop="jdUrl" :rules="[{required: true, message: '请输入商品链接', trigger: 'blur'}]">
+              <el-input type="input" size="small" v-model="form.jdUrl" clearable placeholder="请输入商品链接"></el-input>
+            </el-form-item>
             <el-form-item  style="width: 100%" label="商品描述" prop="description">
               <el-input type="textarea" :rows="4" size="small" v-model="form.description" clearable placeholder="请输入商品描述"></el-input>
             </el-form-item>

From a8ac7b14d4bf6e675990886b00c5379715907dd4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 22 May 2023 16:38:42 +0800
Subject: [PATCH 5/6] bug

---
 .../components/GirdList.vue                   | 37 ++++++++++++++++---
 .../components/ResidentList.vue               | 11 ++----
 .../components/GoodsList.vue                  |  6 ++-
 .../components/GirdList.vue                   | 36 +++++++++++++++---
 .../components/ResidentList.vue               | 10 ++---
 .../components/GoodsList.vue                  |  6 ++-
 6 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
index 47686ce6..ebbaa0fd 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
@@ -68,12 +68,12 @@
           width="350">
           <template v-slot="{ row }">
             <div class="goods">
-              <ai-uploader
-                :disabled="true"
-                :instance="instance"
-                :value="[{url: row.goodsPicUrl}]"
-                :limit="1">
-              </ai-uploader>
+              <div class="img-content">
+                <img :src="row.goodsPicUrl" alt="" v-viewer>
+
+                <span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
+              </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
           </template>
@@ -219,5 +219,30 @@
       display: flex;
       align-items: center;
     }
+    .img-content {
+      position: relative;
+      margin-right: 8px;
+      img {
+        width: 120px;
+        height: 120px;
+        cursor: pointer;
+      }
+    }
+    .type {
+      position: absolute;
+      top: 0;
+      left: 0;
+      font-size: 12px;
+      width: 120px;
+      text-align: center;
+      color: #fff;
+      z-index: 999;
+    }
+    .type1 {
+      background-color: #E64E39;
+    }
+    .type0 {
+      background-color: #FF6900;
+    }
   }
 </style>
diff --git a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
index f275860e..a021c6f5 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
@@ -68,15 +68,11 @@
           width="350">
           <template v-slot="{ row }">
             <div class="goods">
-              <!-- <ai-uploader
-                :disabled="true"
-                :instance="instance"
-                :value="[{url: row.goodsPicUrl}]"
-                :limit="1">
-              </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.goodsPicUrl" alt="" v-viewer>
-                <span class="type" :class="`type`+row.goodsType">{{$dict.getLabel('integralSGType', row.goodsType)}}</span>
+
+                <span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
               </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
@@ -241,6 +237,7 @@
       position: absolute;
       top: 0;
       left: 0;
+      font-size: 12px;
       width: 120px;
       text-align: center;
       color: #fff;
diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
index 18fad76d..f31874da 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
@@ -54,9 +54,10 @@
               </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.picUrl" alt="" v-viewer>
-                <span class="type" :class="`type`+row.type">{{$dict.getLabel('integralSGType', row.type)}}</span>
+                <span class="type type0" v-if="row.type === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
               </div>
-              
+
               <p>{{ row.title }}</p>
             </div>
           </template>
@@ -203,6 +204,7 @@
       text-align: center;
       color: #fff;
       z-index: 999;
+      font-size: 12px;
     }
     .type1 {
       background-color: #E64E39;
diff --git a/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue b/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
index 47686ce6..53515816 100644
--- a/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
+++ b/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
@@ -68,12 +68,11 @@
           width="350">
           <template v-slot="{ row }">
             <div class="goods">
-              <ai-uploader
-                :disabled="true"
-                :instance="instance"
-                :value="[{url: row.goodsPicUrl}]"
-                :limit="1">
-              </ai-uploader>
+              <div class="img-content">
+                <img :src="row.goodsPicUrl" alt="" v-viewer>
+                <span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
+              </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
           </template>
@@ -219,5 +218,30 @@
       display: flex;
       align-items: center;
     }
+    .img-content {
+      position: relative;
+      margin-right: 8px;
+      img {
+        width: 120px;
+        height: 120px;
+        cursor: pointer;
+      }
+    }
+    .type {
+      position: absolute;
+      top: 0;
+      left: 0;
+      font-size: 12px;
+      width: 120px;
+      text-align: center;
+      color: #fff;
+      z-index: 999;
+    }
+    .type1 {
+      background-color: #E64E39;
+    }
+    .type0 {
+      background-color: #FF6900;
+    }
   }
 </style>
diff --git a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
index f275860e..92e1b4cc 100644
--- a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
@@ -68,15 +68,10 @@
           width="350">
           <template v-slot="{ row }">
             <div class="goods">
-              <!-- <ai-uploader
-                :disabled="true"
-                :instance="instance"
-                :value="[{url: row.goodsPicUrl}]"
-                :limit="1">
-              </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.goodsPicUrl" alt="" v-viewer>
-                <span class="type" :class="`type`+row.goodsType">{{$dict.getLabel('integralSGType', row.goodsType)}}</span>
+                <span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
               </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
@@ -241,6 +236,7 @@
       position: absolute;
       top: 0;
       left: 0;
+      font-size: 12px;
       width: 120px;
       text-align: center;
       color: #fff;
diff --git a/project/shuzipingchang/app/AppIntegratingSupermarket/components/GoodsList.vue b/project/shuzipingchang/app/AppIntegratingSupermarket/components/GoodsList.vue
index 18fad76d..f31874da 100644
--- a/project/shuzipingchang/app/AppIntegratingSupermarket/components/GoodsList.vue
+++ b/project/shuzipingchang/app/AppIntegratingSupermarket/components/GoodsList.vue
@@ -54,9 +54,10 @@
               </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.picUrl" alt="" v-viewer>
-                <span class="type" :class="`type`+row.type">{{$dict.getLabel('integralSGType', row.type)}}</span>
+                <span class="type type0" v-if="row.type === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
               </div>
-              
+
               <p>{{ row.title }}</p>
             </div>
           </template>
@@ -203,6 +204,7 @@
       text-align: center;
       color: #fff;
       z-index: 999;
+      font-size: 12px;
     }
     .type1 {
       background-color: #E64E39;

From c71cb51e119cdde5c265b3398fdad8558cb781ae Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 23 May 2023 09:00:21 +0800
Subject: [PATCH 6/6] bug

---
 .../fengdu/app/AppIntegratingOrder/components/GirdList.vue  | 6 +++---
 .../app/AppIntegratingOrder/components/ResidentList.vue     | 2 +-
 .../app/AppIntegratingOrder/components/GirdList.vue         | 6 +++---
 .../app/AppIntegratingOrder/components/ResidentList.vue     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
index ebbaa0fd..e72df932 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
@@ -124,7 +124,8 @@
           status: '',
           size: 10,
           startTime: '',
-          endTime: ''
+          endTime: '',
+          type: 0
         },
         isShow: false,
         form: {
@@ -160,8 +161,7 @@
       getList () {
         this.instance.post(`/app/appintegralsupermarketorder/list`, null, {
           params: {
-            ...this.search,
-            type: 0
+            ...this.search
           }
         }).then((res) => {
           if (res.code == 0) {
diff --git a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
index a021c6f5..2b95d147 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
@@ -128,6 +128,7 @@
           status: '',
           size: 10,
           startTime: '',
+          type: 1,
           endTime: ''
         },
         isShow: false,
@@ -165,7 +166,6 @@
         this.instance.post(`/app/appintegralsupermarketorder/list`, null, {
           params: {
             ...this.search,
-            type: 1,
             girdCode: this.areaId
           }
         }).then((res) => {
diff --git a/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue b/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
index 53515816..4498dfd9 100644
--- a/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
+++ b/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
@@ -123,7 +123,8 @@
           status: '',
           size: 10,
           startTime: '',
-          endTime: ''
+          endTime: '',
+          type: 0
         },
         isShow: false,
         form: {
@@ -159,8 +160,7 @@
       getList () {
         this.instance.post(`/app/appintegralsupermarketorder/list`, null, {
           params: {
-            ...this.search,
-            type: 0
+            ...this.search
           }
         }).then((res) => {
           if (res.code == 0) {
diff --git a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
index 92e1b4cc..02e7abd0 100644
--- a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
@@ -126,6 +126,7 @@
           current: 1,
           status: '',
           size: 10,
+          type: 1,
           startTime: '',
           endTime: ''
         },
@@ -164,7 +165,6 @@
         this.instance.post(`/app/appintegralsupermarketorder/list`, null, {
           params: {
             ...this.search,
-            type: 1,
             girdCode: this.areaId
           }
         }).then((res) => {