供货商

hdApp/src/admin/home/me.vue

@@ -173,7 +173,7 @@ export default {
   methods: {
   suggest(){
       let that = this
-      that.$util.confirmModal({content:'请添加客服微信：15280215347',okText:'复制'},() => {
+      that.$util.confirmModal({content:'请添加客服微信',okText:'复制微信'},() => {
         uni.setClipboardData({
           data: '15280215347',
           success: function() {

hdApp/src/admin/home/workbench.vue

@@ -91,16 +91,17 @@
   <view class="order-page" v-else>
 
 <view class="ghs_list_page flex-col">
-    <view class="ghs_list_area flex-col justify-end">
 
-      <template v-if="!$util.isEmpty(supplierList)">
+  <view style="background-color:white;margin-bottom:20upx;">
+    <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="suggest()">改进建议</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽商家</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启完整功能</button>
+  </view>
 
-        <view style="background-color:white;margin-bottom:20upx;">
-          <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
-          <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="suggest()">改进建议</button>
-          <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽商家</button>
-          <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启完整功能</button>
-        </view>
+  <template v-if="!$util.isEmpty(supplierList)">
+
+    <view class="ghs_list_area flex-col justify-end">
 
         <view class="ghs_box flex-col justify-end" v-for="(ghsInfo, index) in supplierList" :key="index">
           <view class="image-text_7 flex-row justify-between">
@@ -132,12 +133,13 @@
           <view class="button_5 flex-col" v-else @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
           <text style="position:absolute;left:615upx;top:238upx;color:#a9a2a2;" @click.stop="bpSj(ghsInfo)">屏蔽商家</text>
         </view>
-      </template>
-      <block v-else>
-        <AppWrapperEmpty title="暂无供货商" :is-empty="$util.isEmpty(supplierList)" />
-      </block>
-
     </view>
+
+  </template>
+  <block v-else>
+    <emptyComponent title="暂无供货商" :is-empty="$util.isEmpty(supplierList)" />
+  </block>
+
   </view>
 
   </view>
@@ -153,12 +155,12 @@ import { getShopInfo } from "@/utils/auth";
 import { consoleIndex } from "@/api/workbench";
 import NotLogin from "@/components/not-login";
 import autoUpdateMixins from "@/mixins/autoUpdate";
-import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import emptyComponent from "@/components/empty";
 import { ghsList } from "@/api/purchase";
 import { changeDelStatus } from "@/api/ghs";
 export default {
   name: "workbench",
-  components: { NotLogin,AppWrapperEmpty },
+  components: { NotLogin,emptyComponent },
   mixins: [autoUpdateMixins],
   data () {
     return {
@@ -247,7 +249,7 @@ export default {
   methods: {
     suggest(){
       let that = this
-      that.$util.confirmModal({content:'请添加客服微信反馈：15280215347',okText:'复制'},() => {
+      that.$util.confirmModal({content:'请添加客服微信反馈',okText:'复制微信'},() => {
         uni.setClipboardData({
           data: '15280215347',
           success: function() {

hdApp/src/components/empty.vue

@@ -0,0 +1,56 @@
+<template>
+	<div class="app-empty">
+		<div class="app-empty-center">
+			<div class="app_empty_img">
+				<image :src="`${constant.imgUrl}/common/no_data_hua.png`" mode="widthFix"></image>
+			</div>
+			<div class="app-empty-title">
+				<span class="empty_no_data">{{title}}</span>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+	name: 'empty',
+	props: {
+		title: {
+			type: String,
+			default: '暂无数据'
+		}
+	},
+	computed: {
+	},
+	data() {
+		return {}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.app-empty {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    & .app-empty-center {
+        width: 100%;
+    }
+    & .app_empty_img {
+        width: 100%;
+        margin-top:80upx;
+        text-align: center;
+        & image {
+            margin:0 auto;
+            width: 40%;
+        }
+    }
+    & .app-empty-title {
+        font-size: 32upx;
+        margin-top:30upx;
+        text-align:center;
+        color:#666161;
+        & .empty_no_data {
+            font-size:30upx;
+        }
+    }
+}
+</style>

hdApp/src/pagesPurchase/order.vue

@@ -1,15 +1,16 @@
 <template>
   <view class="ghs_list_page flex-col">
-    <view class="ghs_list_area flex-col justify-end">
 
-      <view style="background-color:white;margin-bottom:20upx;">
-        <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
-        <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="suggest()">改进建议</button>
-        <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽商家</button>
-        <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启完整功能</button>
-      </view>
+    <view style="background-color:white;margin-bottom:20upx;">
+      <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
+      <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="suggest()">改进建议</button>
+      <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽商家</button>
+      <button class="admin-button-com mini-btn blue" style="margin-left:13upx;padding-top:15upx;padding-bottom:15upx;" @click="pageTo({url:'/pagesPurchase/open'})">开启完整功能</button>
+    </view>
+
+<template v-if="!$util.isEmpty(supplierList)">
 
-      <template v-if="!$util.isEmpty(supplierList)">
+  <view class="ghs_list_area flex-col justify-end">
 
         <view class="ghs_box flex-col justify-end" v-for="(ghsInfo, index) in supplierList" :key="index">
           <view class="image-text_7 flex-row justify-between">
@@ -42,22 +43,22 @@
           <view class="button_5 flex-col" v-else @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
           <text style="position:absolute;left:615upx;top:238upx;color:#a9a2a2;" @click.stop="bpSj(ghsInfo)">屏蔽商家</text>
         </view>
+    </view>
 
-      </template>
-      <block v-else>
-        <AppWrapperEmpty title="暂无供货商" :is-empty="$util.isEmpty(supplierList)" />
-      </block>
+  </template>
+  <block v-else>
+    <emptyComponent title="暂无供货商" :is-empty="$util.isEmpty(supplierList)" />
+  </block>
 
-    </view>
   </view>
 </template>
 <script>
-import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import emptyComponent from "@/components/empty";
 import { ghsList } from "@/api/purchase";
 import { changeDelStatus } from "@/api/ghs";
 export default {
   components: {
-    AppWrapperEmpty
+    emptyComponent
   },
   data () {
     return {
@@ -75,7 +76,7 @@ export default {
     },
     suggest(){
       let that = this
-      that.$util.confirmModal({content:'请添加客服微信反馈：15280215347',okText:'复制'},() => {
+      that.$util.confirmModal({content:'请添加客服微信反馈',okText:'复制微信'},() => {
         uni.setClipboardData({
           data: '15280215347',
           success: function() {

hdApp/src/pagesPurchase/pb.vue

@@ -1,7 +1,8 @@
 <template>
   <view class="ghs_list_page flex-col">
+    <template v-if="!$util.isEmpty(supplierList)">
     <view class="ghs_list_area flex-col justify-end">
-      <template v-if="!$util.isEmpty(supplierList)">
+      
         <view class="ghs_box flex-col justify-end" v-for="(ghsInfo, index) in supplierList" :key="index">
           <view class="image-text_7 flex-row justify-between">
             <view class="section_1 flex-col">
@@ -30,20 +31,22 @@
           </view>
           <view class="button_4 flex-col" @click="recover(ghsInfo)"><text class="text_13">取消屏蔽</text></view>
         </view>
+    </view>
+
       </template>
       <block v-else>
-        <AppWrapperEmpty title="暂无商家" :is-empty="$util.isEmpty(supplierList)" />
+        <emptyComponent title="没有屏蔽的商家" />
       </block>
-    </view>
+
   </view>
 </template>
 <script>
-import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import emptyComponent from "@/components/empty";
 import { ghsList } from "@/api/purchase";
 import { changeDelStatus } from "@/api/ghs";
 export default {
   components: {
-    AppWrapperEmpty
+    emptyComponent
   },
   data () {
     return {