shish 3 лет назад
Родитель
Сommit
66d258875c

+ 8 - 4
hdApp/src/admin/home/workbench.vue

@@ -96,8 +96,10 @@
       <template v-if="!$util.isEmpty(supplierList)">
 
         <view style="background-color:white;margin-bottom:20upx;">
-          <button class="admin-button-com middle blue" style="margin-left:35upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
-          <button class="admin-button-com middle blue" style="margin-left:40upx;" @click="suggest()">改进建议</button>
+          <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 class="ghs_box flex-col justify-end" v-for="(ghsInfo, index) in supplierList" :key="index">
@@ -128,9 +130,8 @@
           </view>
           <view class="button_4 flex-col" v-if="ghsInfo.isOpen == 1" @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
           <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)" />
@@ -257,6 +258,9 @@ export default {
     bookItem(item){
       const { id } = item
       this.pageTo({url: '/pagesPurchase/bookProduct?id='+id})
+    },
+    bpSj(item){
+
     },
     enterShop(item) {
       if(item.isOpen == 0){

+ 1 - 0
hdApp/src/pages.json

@@ -383,6 +383,7 @@
 				{ "path": "details", "style": { "navigationBarTitleText": "确认订单" } },
 				{ "path": "order", "style": { "navigationBarTitleText": "供货商", "enablePullDownRefresh": true } },
 				{ "path": "pb", "style": { "navigationBarTitleText": "已屏蔽列表", "enablePullDownRefresh": true } },
+				{ "path": "open", "style": { "navigationBarTitleText": "申请完整功能", "enablePullDownRefresh": true } },
 				{ "path": "shopping", "style": { "navigationBarTitleText": "采购", "enablePullDownRefresh": true } },
 				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "setPsd", "style": { "navigationBarTitleText": "设置密码", "enablePullDownRefresh": true } },

+ 59 - 0
hdApp/src/pagesPurchase/open.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="app-content">
+    <div>
+      <form>
+        <div class="module-com input-line-wrap" style="padding:20upx 26upx 0upx 26upx;font-size:32upx;">
+          您正在申请花店零售所需的完整功能,包括商城、订单管理、客户管理和财务管理等。
+        </div>
+        <div class="confirm-btn">
+          <button class="admin-button-com big blue"> 申请开通 </button>
+          <button class="admin-button-com big default" style="margin-top:30upx;"> 申请关闭 </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "open",
+  data() {
+    return {
+    };
+  },
+  methods: {
+  }
+};
+</script>
+<style lang="scss" scoped>
+.app-content {
+  min-height: calc(100vh - 20upx);
+  padding-top: 20upx;
+}
+.prompt-text {
+  color: $fontColor3;
+  padding-left: 30upx;
+  margin-bottom: 30upx;
+}
+.module-com {
+  margin-bottom: 20upx;
+  .member-wrap {
+    .member-det {
+      font-size: 24upx;
+      margin-left: 20upx;
+    }
+  }
+  .remark-wrap {
+    align-items: flex-start;
+    .remark {
+      height: 240upx;
+    }
+  }
+}
+.confirm-btn {
+  width: calc(100% - 60upx);
+  margin: 60upx 30upx 20upx;
+  .admin-button-com {
+    width: 100%;
+  }
+}
+</style>

+ 9 - 5
hdApp/src/pagesPurchase/order.vue

@@ -3,10 +3,10 @@
     <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:12upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
-        <button class="admin-button-com mini-btn blue" style="margin-left:12upx;" @click="suggest()">改进建议</button>
-        <button class="admin-button-com mini-btn blue" style="margin-left:12upx;" @click="pageTo({url:'/pagesPurchase/pb'})">已屏蔽商家</button>
-        <button class="admin-button-com mini-btn blue" style="margin-left:12upx;" @click="hasPb()">申请完整功能</button>
+        <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)">
@@ -26,6 +26,7 @@
             <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>欠款变动记录</text> </view>
             <view class="tag_2" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})"> <text>结账记录</text> </view>
             <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping'})"> <text>买花记录</text> </view>
+            
           </view>
           <view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount)>0">
             <view class="show_clear_area flex-row justify-between">
@@ -39,7 +40,7 @@
           </view>
           <view class="button_4 flex-col" v-if="ghsInfo.isOpen == 1" @click="enterShop(ghsInfo)"><text class="text_13">买花</text></view>
           <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>
@@ -85,6 +86,9 @@ export default {
     bookItem(item){
       const { id } = item
       this.pageTo({url: '/pagesPurchase/bookProduct?id='+id})
+    },
+    bpSj(item){
+
     },
     enterShop(item) {
       if(item.isOpen == 0){