From 44ffb4f607257bbef2feb76c9ec631d26dc04a40 Mon Sep 17 00:00:00 2001
From: yanran200830 <yanran200830@163.com>
Date: Fri, 25 Nov 2022 15:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=20+=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppContentInfo/components/List.vue        | 11 +++-
 project/pidu/app/AppGoods/components/Add.vue  | 55 ++++++++-----------
 project/pidu/app/AppGoods/components/List.vue |  4 +-
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/packages/publicity/AppContentInfo/components/List.vue b/packages/publicity/AppContentInfo/components/List.vue
index 9635e8d1..59b4ff14 100644
--- a/packages/publicity/AppContentInfo/components/List.vue
+++ b/packages/publicity/AppContentInfo/components/List.vue
@@ -6,7 +6,7 @@
           <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
         </template>
         <template #right>
-          <ai-download v-if="permissions('app_appcontentinfo_export')" :instance="instance" url="/app/appcontentinfo/export" :params="search" fileName="数据列表" :disabled="tableData.length == 0">
+          <ai-download v-if="permissions('app_appcontentinfo_export')" :instance="instance" url="/app/appcontentinfo/export" :params="params" fileName="数据列表" :disabled="tableData.length == 0">
             <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
           </ai-download>
           <el-input
@@ -90,7 +90,14 @@
     },
 
     computed: {
-      ...mapState(['user'])
+      ...mapState(['user']),
+
+      params () {
+        return {
+          ...this.search,
+          moduleId: this.$route.query.moduleId
+        }
+      }
     },
 
     created() {
diff --git a/project/pidu/app/AppGoods/components/Add.vue b/project/pidu/app/AppGoods/components/Add.vue
index b23240b7..0aac1948 100644
--- a/project/pidu/app/AppGoods/components/Add.vue
+++ b/project/pidu/app/AppGoods/components/Add.vue
@@ -8,16 +8,15 @@
       <ai-card title="基本信息">
         <template #content>
           <el-form :model="form" label-width="120px" ref="form">
-            <el-form-item label="商品名称" prop="title" :rules="[{required: true, message: '请输入商品名称', trigger: 'blur'}]">
-              <el-input type="input" v-model="form.title" clearable placeholder="请输入商品名称" maxlength="30" show-word-limit></el-input>
+            <el-form-item label="商品名称" prop="merchandiseName" :rules="[{required: true, message: '请输入商品名称', trigger: 'blur'}]">
+              <el-input type="input" v-model="form.merchandiseName" clearable placeholder="请输入商品名称" maxlength="30" show-word-limit></el-input>
             </el-form-item>
-            <el-form-item label="商品图片" prop="thumbUrl">
+            <el-form-item label="商品图片" prop="imageUrl">
               <ai-uploader
                 :instance="instance"
                 isShowTip
-                v-model="form.thumbUrl"
-                :limit="1"
-                :cropOps="cropOps"
+                v-model="form.imageUrl"
+                :limit="9"
                 is-crop>
                 <template slot="tips">
                   <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
@@ -25,25 +24,19 @@
                 </template>
               </ai-uploader>
             </el-form-item>
-            <el-form-item label="商品单价" prop="title" :rules="[{required: true, message: '请输入商品单价', trigger: 'blur'}]">
-              <el-input-number type="input" v-model="form.title" clearable placeholder="请输入商品单价" :min="0"></el-input-number>
+            <el-form-item label="商品单价" prop="merchandiseIntegral" :rules="[{required: true, message: '请输入商品单价', trigger: 'blur'}]">
+              <el-input-number type="input" v-model="form.merchandiseIntegral" clearable placeholder="请输入商品单价" :min="0"></el-input-number>
             </el-form-item>
-            <el-form-item label="商品库存" prop="title" :rules="[{required: true, message: '请输入商品库存', trigger: 'blur'}]">
-              <el-input-number type="input" v-model="form.title" clearable placeholder="请输入商品库存" :min="0"></el-input-number>
+            <el-form-item label="商品库存" prop="merchandiseNumber" :rules="[{required: true, message: '请输入商品库存', trigger: 'blur'}]">
+              <el-input-number type="input" v-model="form.merchandiseNumber" clearable placeholder="请输入商品库存" :min="0"></el-input-number>
             </el-form-item>
-            <el-form-item label="商品名称" prop="title" :rules="[{required: true, message: '请输入商品名称', trigger: 'blur'}]">
-              <el-radio-group v-model="form.title">
-                <el-radio :label="3">不限</el-radio>
-                <el-radio :label="6">仅指定网格可见</el-radio>
+            <el-form-item label="可见范围" prop="visibleRange" :rules="[{required: true, message: '请输入商品名称', trigger: 'blur'}]">
+              <el-radio-group v-model="form.visibleRange">
+                <el-radio label="0">不限</el-radio>
+                <el-radio label="1">仅指定网格可见</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="商品名称" prop="title" :rules="[{required: true, message: '请输入商品名称', trigger: 'blur'}]">
-              <el-radio-group v-model="form.title">
-                <el-radio :label="3">不限</el-radio>
-                <el-radio :label="6">仅指定网格可见</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="选择网格" prop="wxGroupsName" style="width: 100%;" :rules="[{ required: true, message: '请选择网格', trigger: 'change' }]">
+            <el-form-item label="选择网格" v-if="form.visibleRange === '1'" prop="wxGroupsName" style="width: 100%;" :rules="[{ required: true, message: '请选择网格', trigger: 'change' }]">
               <ai-picker
                 :instance="instance"
                 multiple
@@ -51,17 +44,17 @@
                 :ops="{label: 'girdName'}"
                 pageTitle="网格"
                 action="/app/appgirdinfo/girdList"
-                v-model="form.wxGroups"
+                v-model="form.rangeList"
                 @pick="onPick"
                 @change="onSelcetChange">
                 <div class="AppAnnounceDetail-select">
                   <el-input size="small" class="AppAnnounceDetail-select__input" placeholder="请选择..." disabled v-model="form.wxGroupsName"></el-input>
-                  <div class="select-left" v-if="form.wxGroups.length">
+                  <div class="select-left" v-if="form.rangeList.length">
                     <span v-for="(item, index) in form.girdList" :key="index" v-if="index < 9">{{ item }}</span>
                     <em v-if="form.girdList.length > 9">等{{ form.girdList.length }}个</em>
                   </div>
-                  <i v-if="!form.wxGroups.length">请选择</i>
-                  <div class="select-right">{{ form.wxGroups.length ? '重新选择' : '选择' }}</div>
+                  <i v-if="!form.rangeList.length">请选择</i>
+                  <div class="select-right">{{ form.rangeList.length ? '重新选择' : '选择' }}</div>
                 </div>
               </ai-picker>
             </el-form-item>
@@ -92,15 +85,15 @@
       return {
         info: {},
         form: {
-          title: '',
-          content: '',
-          areaId: '',
+          merchandiseName: '',
+          merchandiseIntegral: '',
+          merchandiseNumber: '',
           wxGroupsName: '',
           createUnitName: '',
-          wxGroups: [],
+          rangeList: [],
           createUserName: '',
-          status: '',
-          thumbUrl: []
+          visibleRange: '',
+          imageUrl: []
         },
         girdList: [],
         cropOps: {
diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index b2b70e09..1ce006fd 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -138,7 +138,7 @@
 
     methods: {
       getList () {
-        this.instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
+        this.instance.post(`/app/appintegralmerchandise/list`, null, {
           params: {
             ...this.search,
             arriveAreaId: this.search.arriveAreaId,
@@ -164,7 +164,7 @@
 
       remove (id) {
         this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then(res => {
+          this.instance.post(`/app/appintegralmerchandise/delete?id=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()