修改地址

hdApp/src/admin/cg/mall.vue

@@ -3,7 +3,7 @@
     <view class="img_box">
       <image :src="imgUrl" mode="heightFix" class="img_url"></image>
     </view>
-    <view style="margin:0 auto;width:50vw;font-size:30upx;font-weight:bold;text-align:center;">花束</view>
+    <view style="margin:20upx auto 0 auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">花束</view>
     <div class="confirm-btn">
       <button class="admin-button-com big blue" style="width:50vw;" @click="downloadImg(imgUrl)">保存图片</button>
     </div>
@@ -11,10 +11,10 @@
       <button class="admin-button-com big blue" style="width:50vw;" @click="goToMallPt('pages/home/category')">直接打开</button>
     </div>
 
-    <view class="img_box">
+    <view class="img_box" style="margin-top:30upx;">
       <image :src="flowerImgUrl" mode="heightFix" class="img_url"></image>
     </view>
-    <view style="margin:0 auto;width:50vw;font-size:30upx;font-weight:bold;text-align:center;">散花</view>
+    <view style="margin:20upx auto 0 auto;width:50vw;font-size:35upx;font-weight:bold;text-align:center;">散花</view>
     <div class="confirm-btn">
       <button class="admin-button-com big blue" style="width:50vw;" @click="downloadImg(flowerImgUrl)">保存图片</button>
     </div>

hdApp/src/admin/home/apply.vue

@@ -45,7 +45,9 @@ export default {
                 { name: "品类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/kind",pf:1},
                 { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/price-increase",pf:1},
                 { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/freight",pf:1},
-                { name: "商品盘点", img: `${this.$constant.imgUrl}/ghs/home/pandian.png`, url: "/admin/goods/pdList",pf:1}
+                { name: "商品盘点", img: `${this.$constant.imgUrl}/ghs/home/pandian.png`, url: "/admin/goods/pdList",pf:1},
+                { name: "商城", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/admin/cg/mall",pf:1},
+                { name: "开关商城", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/pagesPurchase/open",pf:1}
             ]
         },
         {

hdApp/src/admin/home/workbench.vue

@@ -133,10 +133,11 @@
 <view class="ghs_list_page flex-col">
 
   <view style="background-color:white;margin-bottom:20upx;">
-    <button class="admin-button-com mini-btn blue" style="margin-left:16upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
-    <button class="admin-button-com mini-btn blue" style="margin-left:16upx;padding-top:17upx;padding-bottom:17upx;" @click="suggest()">改进建议</button>
-    <button class="admin-button-com mini-btn blue" style="margin-left:16upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽列表</button>
-    <button class="admin-button-com mini-btn blue" style="margin-left:16upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/open'})">商城功能开关</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/staff/list'})">添加员工</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/shop/add?id='+loginInfo.shopId})">修改地址</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/open'})">开关商城</button>
+    <button class="admin-button-com mini-btn blue" style="margin-left:12upx;padding-top:17upx;padding-bottom:17upx;" @click="goMore()">更多</button>
   </view>
 
   <template v-if="!$util.isEmpty(ad)">
@@ -304,6 +305,20 @@ export default {
 
   },
   methods: {
+    goMore(){
+      let that = this
+      uni.showActionSheet({
+        itemList: ['已屏蔽列表', '改进建议'],
+        success: function (res) {
+          if(res.tapIndex == 0){
+            that.$util.pageTo({url: '/pagesPurchase/pb'})
+          }
+          if(res.tapIndex == 1){
+            that.suggest()
+          }
+        }
+      });
+    },
     showShopName(){
       getShopInfo().then(res => {
         if(res.name){
@@ -315,7 +330,7 @@ export default {
     },
     suggest(){
       let that = this
-      that.$util.confirmModal({content:'请添加客服微信反馈',okText:'复制微信'},() => {
+      that.$util.confirmModal({content:'请添加技术人员微信反馈',okText:'复制微信'},() => {
         uni.setClipboardData({
           data: '15280215347',
           success: function() {
@@ -895,7 +910,7 @@ export default {
         width: 130upx;
         position: absolute;
         left: 570upx;
-        top: 105upx;
+        top: 98upx;
         border-radius:39upx;
         .text_13 {
           color: rgba(255, 255, 255, 1);
@@ -912,7 +927,7 @@ export default {
         width: 130upx;
         position: absolute;
         left: 570upx;
-        top: 105upx;
+        top: 98upx;
         border-radius:39upx;
         .text_13 {
           color: rgba(255, 255, 255, 1);
@@ -929,7 +944,7 @@ export default {
         width: 170upx;
         position: absolute;
         left: 540upx;
-        top: 105upx;
+        top: 98upx;
         border-radius:39upx;
         .text_13 {
           color: rgba(255, 255, 255, 1);

hdApp/src/admin/staff/list.vue

@@ -362,7 +362,7 @@ export default {
 	.app-footer {
 		justify-content: flex-end;
 		.admin-button-com {
-			width: 160upx;
+			width:260upx;
 			margin-right: 30upx;
 		}
 	}

hdApp/src/pagesPurchase/order.vue

@@ -1,13 +1,6 @@
 <template>
   <view class="ghs_list_page flex-col">
 
-    <view style="background-color:white;margin-bottom:20upx;">
-      <button class="admin-button-com mini-btn blue" style="margin-left:16upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
-      <button class="admin-button-com mini-btn blue" style="margin-left:16upx;padding-top:17upx;padding-bottom:17upx;" @click="suggest()">改进建议</button>
-      <button class="admin-button-com mini-btn blue" style="margin-left:16upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽列表</button>
-      <button class="admin-button-com mini-btn blue" style="margin-left:16upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/pagesPurchase/open'})">商城功能开关</button>
-    </view>
-
   <template v-if="!$util.isEmpty(ad)">
     <block v-for="(adInfo, adIndex) in ad" :key="adIndex">
       <view style="text-align:center;" @click.stop="pageTo({url:adInfo.url})">
@@ -16,11 +9,8 @@
     </block>
   </template>
 
-
-
       <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">
                 <view class="section_1 flex-col">