diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue b/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue
index 1f70a6ce..6dac6056 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/AddStore.vue
@@ -72,7 +72,7 @@
                     :value="[{url: row.goods.picUrl}]"
                     :limit="1">
                   </ai-uploader>
-                  <p>{{ row.goods.title }}</p>
+                  <!-- <p>{{ row.goods.title }}</p> -->
                 </div>
               </template>
             </el-table-column>
@@ -142,7 +142,7 @@
               class="search-input"
               size="small"
               v-throttle="() => {search.current = 1, getList()}"
-              placeholder="请输入商品名称"
+              placeholder="请输入商品名称/商品类型说明"
               clearable
               @clear="search.current = 1, search.title = '', getList()"
               suffix-icon="iconfont iconSearch">
@@ -221,6 +221,7 @@
         chooseColConfigs: [
           { slot: 'goods' },
           { prop: 'goods',  label: '商品类型', align: 'center', format: v => this.dict.getLabel('integralSGType', v.type) },
+          { prop: 'typeExplain',  label: '商品类型说明'},
           { slot: 'integralPrice' },
           { slot: 'payMoney' },
           { prop: 'goods',  label: '商品链接', align: 'center', format: v => v.jdUrl },
@@ -232,6 +233,7 @@
           { prop: 'serialNumber',  label: '商品ID', align: 'center' },
           { slot: 'goods', align: 'center' },
           { prop: 'type',  label: '商品类型', align: 'center', format: v => this.dict.getLabel('integralSGType', v) },
+          { prop: 'typeExplain',  label: '商品类型说明'},
           { prop: 'onlineTime',  label: '上架时间', align: 'center' },
           { prop: 'status', width: 90,  label: '状态', align: 'center', format: v => this.dict.getLabel('integralSGStatus', v) }
         ],
@@ -335,6 +337,9 @@
       getInfo (id) {
         this.instance.post(`/app/appintegralsupermarketshop/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
+            res.data.goodsList.map((item) => {
+              item.typeExplain = item.goods.typeExplain
+            })
             this.form = {
               ...res.data,
               visibleNames: '1',
diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
index f31874da..e1c36a52 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
@@ -16,6 +16,22 @@
             placeholder="请选择类型"
             :selectList="dict.getDict('integralSGStatus')">
           </ai-select>
+          <ai-picker
+            :instance="instance"
+            :multiple="false"
+            dialogTitle="请选择服务地区"
+            :ops="{ label: 'girdName' }"
+            pageTitle="网格"
+            action="/app/appgirdinfo/girdList"
+            v-model="userList"
+            @pick="onGridChange">
+            <div class="userSelcet">
+              <span style="color: #606266;" v-if="search.visibleId">{{ search.girdName }}</span>
+              <span v-else>请选择服务地区</span>
+              <i class="el-icon-arrow-up"  v-if="!search.visibleId"></i>
+              <i class="el-icon-circle-close" v-if="search.visibleId" @click.stop="search.visibleId = '', search.girdName = '', search.current = 1, getList()"></i>
+            </div>
+          </ai-picker>
         </template>
         <template slot="right">
           <el-input
@@ -97,7 +113,9 @@
           title: '',
           current: 1,
           status: '',
-          size: 10
+          size: 10,
+          visibleId: '',
+          girdName: ''
         },
         total: 0,
         tableData: [],
@@ -107,7 +125,8 @@
           { prop: 'type',  label: '商品类型', align: 'center', format: v => this.dict.getLabel('integralSGType', v) },
           { prop: 'onlineTime',  label: '上架时间', align: 'center' },
           { prop: 'status',  label: '状态', align: 'center', format: v => this.dict.getLabel('integralSGStatus', v) }
-        ]
+        ],
+        userList: []
       }
     },
 
@@ -121,6 +140,14 @@
     },
 
     methods: {
+      onGridChange (e) {
+        if (e.length) {
+          this.search.visibleId = e[0].girdCode
+          this.search.girdName = e[0].girdName
+          this.search.current = 1
+          this.getList()
+        }
+      },
       getList () {
         this.instance.post(`/app/appintegralsupermarketgoods/list`, null, {
           params: {
@@ -134,6 +161,14 @@
         })
       },
 
+      onAreaChange () {
+        this.search.current = 1
+
+        this.$nextTick(() => {
+          this.getTableData()
+        })
+      },
+
       toAdd (id) {
         this.$emit('change', {
           type: 'AddGoods',
@@ -212,5 +247,47 @@
     .type0 {
       background-color: #FF6900;
     }
+    .userSelcet {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 215px;
+      height: 32px;
+      line-height: 32px;
+      border-radius: 4px;
+      border: 1px solid #d0d4dc;
+      overflow: hidden;
+      cursor: pointer;
+      transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+
+      &:hover {
+        border-color: $placeholderColor;
+      }
+
+      i {
+        display: flex;
+        position: relative;
+        align-items: center;
+        justify-content: center;
+        width: 30px;
+        height: 100%;
+        line-height: 32px;
+        font-size: 14px;
+        text-align: center;
+        color: #d0d4dc;
+        transform: rotateZ(180deg);
+      }
+
+      .el-icon-circle-close:hover {
+        opacity: 0.6;
+      }
+
+      span {
+        flex: 1;
+        padding: 0 15px;
+        font-size: 12px;
+        color: $placeholderColor;
+      }
+    }
   }
 </style>
diff --git a/project/pidu/app/AppSensitive/AppSensitive.vue b/project/pidu/app/AppSensitive/AppSensitive.vue
index 72b7d50b..985f4797 100644
--- a/project/pidu/app/AppSensitive/AppSensitive.vue
+++ b/project/pidu/app/AppSensitive/AppSensitive.vue
@@ -4,12 +4,12 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <ai-area-get
+            <!-- <ai-area-get
               style="width: 180px;"
               placeholder="请选择地区"
               :instance="instance"
               v-model="search.areaId"
-              @select="onAreaChange"/>
+              @select="onAreaChange"/> -->
             <el-cascader ref="cascader1" clearable v-model="departIdList" :options="girdOptions" placeholder="所属部门" size="small"
               :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
               <ai-select v-model="search.integralType" placeholder="会话类型" @change="current=1, getTableData()"