From a698ef19cbe3691c7144318aa7db43cec793df43 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 12 Apr 2023 11:32:25 +0800
Subject: [PATCH] =?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

---
 project/fengdu/app/AppHelp/components/Add.vue            | 9 +++++++++
 .../AppIntegratingSupermarket.vue                        | 8 +-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/project/fengdu/app/AppHelp/components/Add.vue b/project/fengdu/app/AppHelp/components/Add.vue
index a1d2930c..451f3586 100644
--- a/project/fengdu/app/AppHelp/components/Add.vue
+++ b/project/fengdu/app/AppHelp/components/Add.vue
@@ -17,6 +17,9 @@
                 </div>
               </ai-picker>
             </el-form-item>
+            <el-form-item prop="visibleAreaId" style="width: 100%;" label="发布地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
+              <ai-area-select clearable @fullname="v => form.visibleAreaName = v" always-show :instance="instance" v-model="form.visibleAreaId" :disabled-level="disabledLevel"></ai-area-select>
+            </el-form-item>
             <el-form-item label="发布内容" prop="content" style="width: 100%;" :rules="[{required: true, message: '请输入发布内容', trigger: 'change'}]">
               <!-- <ai-editor v-model="form.content" :instance="instance"/> -->
               <el-input type="textarea" placeholder="请输入内容" v-model="form.content" rows="8" maxlength="500" :show-word-limit="true"></el-input>
@@ -59,7 +62,10 @@
         form: {
           themeId: '',
           content: '',
+          areaId: '',
+          visibleAreaName: '',
           files: [],
+          areaName: '',
           publishDepartName: '',
           publishDepartIdList: [],
         },
@@ -79,6 +85,9 @@
         this.id = this.params.id
         this.getInfo(this.params.id)
       }
+      this.form.visibleAreaId =this.user.info.areaId
+      this.form.visibleAreaName =this.user.info.areaName
+      this.disabledLevel = this.user.info.areaList.length
       this.getTalkList()
     },
 
diff --git a/project/fengdu/app/AppIntegratingSupermarket/AppIntegratingSupermarket.vue b/project/fengdu/app/AppIntegratingSupermarket/AppIntegratingSupermarket.vue
index 3ace6e35..edc939a0 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/AppIntegratingSupermarket.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/AppIntegratingSupermarket.vue
@@ -25,17 +25,15 @@
 </template>
 
 <script>
-import orderManagement from './orderManagement'
 import goodsManagement from './goodsManagement'
 import storeManagement from './storeManagement'
-import addOrderDetail from './components/addOrder'
 import addGoods from './components/addGoods'
 import {mapState} from 'vuex'
 
 export default {
   name: "AppIntegratingSupermarket",
   label: "积分超市",
-  components: {orderManagement, goodsManagement, storeManagement, addOrderDetail, addGoods},
+  components: { goodsManagement, storeManagement, addGoods},
   props: {
     instance: Function,
     dict: Object,
@@ -44,10 +42,6 @@ export default {
 
   computed: {
     tabs() {
-      // .filter(item => {
-      //   return this.$permissions(item.permission)
-      // })
-
       return [
         {
           label: "商品信息",