shish 4 месяцев назад
Родитель
Сommit
ea42668304
3 измененных файлов с 7 добавлено и 37 удалено
  1. 3 27
      hdApp/src/admin/home/mall.vue
  2. 3 7
      hdApp/src/admin/home/me.vue
  3. 1 3
      hdApp/src/admin/home/workbench.vue

+ 3 - 27
hdApp/src/admin/home/mall.vue

@@ -254,7 +254,7 @@
       </view>
     </view>
   </uni-popup>
-
+  <NotLogin></NotLogin>
   <custom-tab-bar :current="2" />
 
 </view>
@@ -272,8 +272,10 @@ import {currentShop, uploadShopAvatar} from "@/api/shop";
 import { clearLogin,hasNotice } from "@/api/admin";
 import { unReadMsgCount } from "@/api/chat";
 import { APIHOST,CURRENT_ENV } from "@/config";
+import NotLogin from "@/components/not-login";
 export default {
   name: "workbench",
+  components: {NotLogin},
   mixins: [autoUpdateMixins],
   data () {
     return {
@@ -475,23 +477,6 @@ export default {
 		closeToShow(){
 			this.$refs.toShowMore.close()
 		},
-    // 显示供货商提示弹框
-    showSupplierNotice() {
-      // 设置要显示的供货商列表,最多显示5个
-      this.displaySupplierList = this.supplierList.filter(item => item.name).slice(0, 5)
-      this.$refs.supplierNoticePopup.open('center')
-    },
-    // 关闭供货商提示弹框
-    closeSupplierNotice() {
-      this.$refs.supplierNoticePopup.close()
-      // 调用已有的接口标记已通知
-      hasNotice().then(res => { })
-    },
-    // 下次提醒
-    remindLater() {
-      this.$refs.supplierNoticePopup.close()
-      // 不调用hasNotice接口,保持提醒状态
-    },
     getMore(info){
 			this.currentGhs = info
 			this.$refs.toShowMore.open('top')
@@ -685,15 +670,6 @@ export default {
       }
       this.$util.pageTo(item)
     },
-    toRemindCustom(){
-        if(this.loginStyle==1){
-          hasMoreGhs().then(ret=>{
-            if(ret.data.needNotice == 1){
-              this.showSupplierNotice()
-            }
-          })
-        }
-    },
     noticeFn (item) {
       this.$util.pageTo({ url: item.page })
     },

+ 3 - 7
hdApp/src/admin/home/me.vue

@@ -137,19 +137,15 @@
 
             <!-- 应用管理 -->
             <view class="settings-category">
-              <view class="category-title">📱 应用管理</view>
+              <view class="category-title" @click.stop="getHzg()">📱 应用管理</view>
               <view class="category-items">
                 <!-- #ifdef APP-PLUS -->
-                <view class="menu-item" @click="getHzg()">
-                  <text class="item-label">更新APP</text>
-                  <i class="iconfont iconxiangyou"></i>
-                </view>
-                <view class="menu-item" @click="closeApp()" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
+                <view class="menu-item" @click="closeApp()">
                   <text class="item-label">关闭APP</text>
                   <i class="iconfont iconxiangyou"></i>
                 </view>
                 <!-- #endif -->
-                <view class="menu-item" @click="moreFunction()" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
+                <view class="menu-item" @click="moreFunction()">
                   <text class="item-label">更多功能</text>
                   <i class="iconfont iconxiangyou"></i>
                 </view>

+ 1 - 3
hdApp/src/admin/home/workbench.vue

@@ -235,7 +235,7 @@
         </view>
       </view>
     </uni-popup>
-    <NotLogin></NotLogin>
+
     <custom-tab-bar :current="0" />
 
   </view>
@@ -253,10 +253,8 @@
   import { clearLogin,hasNotice } from "@/api/admin";
   import { unReadMsgCount } from "@/api/chat";
   import { APIHOST } from "@/config";
-  import NotLogin from "@/components/not-login";
   export default {
     name: "workbench",
-    components: {NotLogin},
     mixins: [autoUpdateMixins],
     data () {
       return {