Explorar o código

Merge branch 'master' into nomobilelogin

shish hai 1 ano
pai
achega
6db28e4a7b
Modificáronse 3 ficheiros con 537 adicións e 551 borrados
  1. 376 402
      hdApp/src/admin/home/workbench.vue
  2. 4 0
      hdApp/src/api/ghs/index.js
  3. 157 149
      hdApp/src/pagesPurchase/order.vue

+ 376 - 402
hdApp/src/admin/home/workbench.vue

@@ -7,277 +7,282 @@
     </view>
   </block>
   <block v-else>
-  <div class="app-main app-content" v-if="loginStyle  == 2">
-
-<template v-if="lookMoney == 1">
-
-    <div class="user-wrap" :style="{ backgroundImage: `url(${constant.imgUrl}/home/bg_hd_home2.png)` }">
-      <div class="user-top">
-        <div class="app-size-28">今日概况</div>
-      </div>
-      <div class="income-amount" @click="pageTo({url:'/admin/stat/kdIncome'})">
-        <div>收入</div>
-        <div class="price">{{ $util.numberFormat(data.todayData.income) }}</div>
-      </div>
-      <div class="user-bottom">
-        <div class="info-list">
-          <div class="info-list-name">访客</div>
-          <div class="info-list-value">
-            {{ $util.numberFormat(data.todayData.visit) || 0 }}
+    <div class="app-main app-content" v-if="loginStyle  == 2">
+      <template v-if="lookMoney == 1">
+        <div class="user-wrap" :style="{ backgroundImage: `url(${constant.imgUrl}/home/bg_hd_home2.png)` }">
+          <div class="user-top">
+            <div class="app-size-28">今日概况</div>
           </div>
-        </div>
-        <navigator url="/admin/home/order" open-type="switchTab" class="info-list">
-          <div class="info-list-name">订单</div>
-          <div class="info-list-value">
-            {{ $util.numberFormat(data.todayData.order) || 0 }}
+          <div class="income-amount" @click="pageTo({url:'/admin/stat/kdIncome'})">
+            <div>收入</div>
+            <div class="price">{{ $util.numberFormat(data.todayData.income) }}</div>
           </div>
-        </navigator>
-        <div class="info-list">
-          <div class="info-list-name">昨天</div>
-          <div class="info-list-value">
-            {{ $util.numberFormat(0) || 0 }}
+          <div class="user-bottom">
+            <div class="info-list">
+              <div class="info-list-name">访客</div>
+              <div class="info-list-value">
+                {{ $util.numberFormat(data.todayData.visit) || 0 }}
+              </div>
+            </div>
+            <navigator url="/admin/home/order" open-type="switchTab" class="info-list">
+              <div class="info-list-name">订单</div>
+              <div class="info-list-value">
+                {{ $util.numberFormat(data.todayData.order) || 0 }}
+              </div>
+            </navigator>
+            <div class="info-list">
+              <div class="info-list-name">昨天</div>
+              <div class="info-list-value">
+                {{ $util.numberFormat(0) || 0 }}
+              </div>
+            </div>
           </div>
         </div>
-      </div>
-    </div>
-
-		<div class="module-com order-wrap" @click="pageTo({url:'/admin/stat/kdIncome'})">
-			<div class="total-blo">
-				<div class="total-list2"> 
-					<div class="app-color-3">系统收款</div>
-					<div class="list-num">
-						<view>{{countStat.systemCount||0}}</view>
-						<view>{{countStat.systemIncome?parseFloat(countStat.systemIncome):0}}</view>
-					</div>
-				</div>
-				<div class="total-list2"> 
-					<div class="app-color-3">线下微信</div>
-					<div class="list-num">
-						<view>{{countStat.kfWxCount||0}}</view>
-						<view>{{countStat.kfWxIncome?parseFloat(countStat.kfWxIncome):0}}</view>
-					</div> 
-				</div>
-				<div class="total-list2"> 
-					<div class="app-color-3">现金</div>
-					<div class="list-num">
-						<view>{{countStat.cashCount||0}}</view>
-						<view>{{countStat.cashIncome?parseFloat(countStat.cashIncome):0}}</view>
-					</div> 
-				</div>
-				<div class="total-list2"> 
-					<div class="app-color-3">赊账</div>
-					<div class="list-num">
-						<view>{{countStat.debtCount||0}}</view>
-						<view>{{countStat.debtIncome?parseFloat(countStat.debtIncome):0}}</view>
-					</div> 
-				</div>
-			</div>
-		</div>
-
-</template>
-
-  <div class="module-com news-wrap">
-    <div class="news-list" v-for="(item, index) in data.notice" :key="index" @click="noticeFn(item)" >
-      <div class="news-left">
-        <i class="iconfont iconxiaoxi2 ling"></i>
-        <span>{{ item.title }}</span>
-      </div>
-      <div class="news-right">
-        <span>{{ item.action }}</span>
-        <i class="iconfont iconxiangyou"></i>
-      </div>
-    </div>
-  </div>
-
-  <view v-if="!$util.isEmpty(data.warning)" style="color:red;font-size:36upx;font-weight:bold;text-align: center;margin-bottom:15upx;">{{ data.warning }}</view>
-
-  <view class="module-com">
-    <view class="tabs-head_bx">
-      <image @click="goKjKd()" :src="lskd1" mode="widthFix"></image>
-      <image @click="goShKd()" :src="lskd2" mode="widthFix"></image>
-    </view>
-    <div class="tabs-wrap">
-      <div class="tabs-list" v-for="(item, index) in tabsData" :key="index" >
-        <div @click="goPage(item)">
-          <div class="tabs-img">
-            <img :src="`${constant.hostUrl}/image/${item.img}`" alt mode="widthFix" />
+        <div class="module-com order-wrap" @click="pageTo({url:'/admin/stat/kdIncome'})">
+          <div class="total-blo">
+            <div class="total-list2"> 
+              <div class="app-color-3">系统收款</div>
+              <div class="list-num">
+                <view>{{countStat.systemCount||0}}</view>
+                <view>{{countStat.systemIncome?parseFloat(countStat.systemIncome):0}}</view>
+              </div>
+            </div>
+            <div class="total-list2"> 
+              <div class="app-color-3">线下微信</div>
+              <div class="list-num">
+                <view>{{countStat.kfWxCount||0}}</view>
+                <view>{{countStat.kfWxIncome?parseFloat(countStat.kfWxIncome):0}}</view>
+              </div> 
+            </div>
+            <div class="total-list2"> 
+              <div class="app-color-3">现金</div>
+              <div class="list-num">
+                <view>{{countStat.cashCount||0}}</view>
+                <view>{{countStat.cashIncome?parseFloat(countStat.cashIncome):0}}</view>
+              </div> 
+            </div>
+            <div class="total-list2"> 
+              <div class="app-color-3">赊账</div>
+              <div class="list-num">
+                <view>{{countStat.debtCount||0}}</view>
+                <view>{{countStat.debtIncome?parseFloat(countStat.debtIncome):0}}</view>
+              </div> 
+            </div>
           </div>
-          <div class="tabs-name">{{ item.name }}</div>
         </div>
-      </div>
-    </div>
-  </view>
-
-	<template v-if="lookMoney == 1">
-      <div class="module-com total-wrap">
-        <div class="total-tit">总览</div>
-        <div class="total-blo">
-          <div class="total-list" v-for="(item, index) in overview" :key="index" @click="pageTo(item)">
-            <div class="list-num">{{ $util.numberFormat(item.value) }}</div>
-            <div class="app-color-3">{{ item.name }}</div>
+      </template>
+      <div class="module-com news-wrap">
+        <div class="news-list" v-for="(item, index) in data.notice" :key="index" @click="noticeFn(item)" >
+          <div class="news-left">
+            <i class="iconfont iconxiaoxi2 ling"></i>
+            <span>{{ item.title }}</span>
+          </div>
+          <div class="news-right">
+            <span>{{ item.action }}</span>
+            <i class="iconfont iconxiangyou"></i>
           </div>
         </div>
       </div>
-    </template>
-
-  </div>
-  <view class="order-page" v-else>
-
-<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:11upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/shop/myShop'})">我的门店</button>
-    <button class="admin-button-com mini-btn blue" style="margin-left:11upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/staff/list'})">我的员工</button>
-    <button class="admin-button-com mini-btn blue" style="margin-left:11upx;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:11upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
-    <button class="admin-button-com mini-btn blue" style="margin-left:11upx;padding-top:17upx;padding-bottom:17upx;" @click="goMore()">更多</button>
-  </view>
-  <view style="text-align:center;font-size:29upx;">您好,{{ loginInfo.admin && loginInfo.admin.name ? loginInfo.admin.name : '' }} {{ loginInfo.admin && loginInfo.admin.mobile ? loginInfo.admin.mobile : '' }}</view>
-
-  <view v-if="!$util.isEmpty(data.warning)" style="color:red;font-size:36upx;font-weight:bold;text-align: center;margin-bottom:15upx;margin-top:20upx;">{{ data.warning }}</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})">
-        <image :src="adInfo.banner" mode="widthFix" style="width:97%;margin:0 auto;"></image>
+      <view v-if="!$util.isEmpty(data.warning)" style="color:red;font-size:36upx;font-weight:bold;text-align: center;margin-bottom:15upx;">{{ data.warning }}</view>
+      <view class="module-com">
+        <view class="tabs-head_bx">
+          <image @click="goKjKd()" :src="lskd1" mode="widthFix"></image>
+          <image @click="goShKd()" :src="lskd2" mode="widthFix"></image>
+        </view>
+        <div class="tabs-wrap">
+          <div class="tabs-list" v-for="(item, index) in tabsData" :key="index" >
+            <div @click="goPage(item)">
+              <div class="tabs-img">
+                <img :src="`${constant.hostUrl}/image/${item.img}`" alt mode="widthFix" />
+              </div>
+              <div class="tabs-name">{{ item.name }}</div>
+            </div>
+          </div>
+        </div>
       </view>
-    </block>
-  </template>
-
-  <template v-if="!$util.isEmpty(supplierList)">
-
-    <view class="ghs_list_area flex-col justify-end">
+      <template v-if="lookMoney == 1">
+        <div class="module-com total-wrap">
+          <div class="total-tit">总览</div>
+          <div class="total-blo">
+            <div class="total-list" v-for="(item, index) in overview" :key="index" @click="pageTo(item)">
+              <div class="list-num">{{ $util.numberFormat(item.value) }}</div>
+              <div class="app-color-3">{{ item.name }}</div>
+            </div>
+          </div>
+        </div>
+      </template>
+    </div>
+    <view class="order-page" v-else>
+      <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:11upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/shop/myShop'})">我的门店</button>
+          <button class="admin-button-com mini-btn blue" style="margin-left:11upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/staff/list'})">我的员工</button>
+          <button class="admin-button-com mini-btn blue" style="margin-left:11upx;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:11upx;padding-top:17upx;padding-bottom:17upx;" @click="pageTo({url:'/admin/stat/cgItem'})">采购统计</button>
+          <button class="admin-button-com mini-btn blue" style="margin-left:11upx;padding-top:17upx;padding-bottom:17upx;" @click="goMore()">更多</button>
+        </view>
+        <view style="text-align:center;font-size:29upx;">您好,{{ loginInfo.admin && loginInfo.admin.name ? loginInfo.admin.name : '' }} {{ loginInfo.admin && loginInfo.admin.mobile ? loginInfo.admin.mobile : '' }}</view>
+        <view v-if="!$util.isEmpty(data.warning)" style="color:red;font-size:36upx;font-weight:bold;text-align: center;margin-bottom:15upx;margin-top:20upx;">{{ data.warning }}</view>
 
-        <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">
-              <image class="logo" :src="ghsInfo.smallAvatar" @click="enterShop(ghsInfo)" />
+        <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})">
+              <image :src="adInfo.banner" mode="widthFix" style="width:97%;margin:0 auto;"></image>
             </view>
-            <view class="text-group_7 flex-col justify-between" @click="enterShop(ghsInfo)">
-              <text class="text_8">{{ghsInfo.name}}</text>
-              <text class="text_9">
+          </block>
+        </template>
 
-<block v-if="ghsInfo.cutStyle && ghsInfo.cutStyle == 1">
+        <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">
+                  <view class="section_1 flex-col">
+                    <image class="logo" :src="ghsInfo.smallAvatar" @click="enterShop(ghsInfo)" />
+                  </view>
+                  <view class="text-group_7 flex-col justify-between" @click="enterShop(ghsInfo)">
+                    <text class="text_8">{{ghsInfo.name}}</text>
+                    <text class="text_9">
+                      <block v-if="ghsInfo.cutStyle && ghsInfo.cutStyle == 1">
+                        <block v-if="ghsInfo.meetNum == 1 || ghsInfo.meetAmount == 1">
+                          <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
+                            <text style="color:red;font-weight:bold;">
+                              全场{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                            </text>
+                          </block>
+                          <block v-else>
+                            <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
+                              全场{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                            </text>
+                          </block>
+                        </block>
+                        <block v-else>
+                          <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
+                            <text style="color:red;font-weight:bold;">
+                              满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                            </text>
+                          </block>
+                          <block v-else>
+                            <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
+                              满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                            </text>
+                          </block>
+                        </block>
 
-  <block v-if="ghsInfo.meetNum == 1 || ghsInfo.meetAmount == 1">
-                    <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
-                      <text style="color:red;font-weight:bold;">
-                        全场{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
-                      </text>
-                    </block>
-                    <block v-else>
-                      <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
-                        全场{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
-                      </text>
-                    </block>
-  </block>
-  <block v-else>
-                    <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
-                      <text style="color:red;font-weight:bold;">
-                        满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                      </block>
+                      <block v-else>
+                        <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
+                          <text style="color:red;font-weight:bold;">
+                            满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                          </text>
+                        </block>
+                        <block v-else>
+                          <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
+                            满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                          </text>
+                        </block>
+                      </block>
+                    </text>
+                  </view>
+                </view>
+                <view class="box_4 flex-col"></view>
+                <view class="box_9">
+                  <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?ghsId='+ghsInfo.id+'&ghsName='+ghsInfo.name})"> <text>买花记录</text> </view>
+                  <view class="tag_2" @click.stop="callUp(ghsInfo)" style="color:green;font-weight:bold;"> <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">
+                    <text class="waite_clear_order">
+                      待结订单 {{ghsInfo.debtNum}}笔 合计¥{{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}
+                      <text style="margin-left:30upx;" v-if="ghsInfo.remainDebtAmount>0">选订单结 》</text>
+                    </text>
+                  </view>
+                </view>
+
+                <block v-if="Number(ghsInfo.balance)>0">
+                  <view class="box_6 flex-row" v-if="ghsInfo.remainDebtAmount>0" @click.stop="recharge(ghsInfo)">
+                    <view class="show_clear_area flex-row justify-between">
+                      <text class="waite_clear_order" style="color:#3385ff;">
+                          <text v-if="Number(ghsInfo.balance)>0">减去余额¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}</text>
+                          <text v-if="ghsInfo.remainDebtAmount>0" style="margin-left:15upx;">实欠¥{{ ghsInfo.remainDebtAmount }}</text>
+                          <text style="margin-left:30upx;">按金额结 》</text>
                       </text>
-                    </block>
-                    <block v-else>
-                      <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
-                        满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                    </view>
+                  </view>
+
+                  <view class="box_6 flex-row" v-if="ghsInfo.remainDebtAmount<0" @click.stop="recharge(ghsInfo)">
+                    <view class="show_clear_area flex-row justify-between">
+                      <text class="waite_clear_order" style="color:#3385ff;">
+                          <text>账户余额¥{{ Math.abs(ghsInfo.remainDebtAmount) }}</text>
+                          <text style="margin-left:30upx;">已结清</text>
                       </text>
-                    </block>
-  </block>
+                    </view>
+                  </view>
+                </block>
 
-</block>
-<block v-else>
-                <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
-                  <text style="color:red;font-weight:bold;">
-                    满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
-                  </text>
+                <block v-if="ghsInfo.live == 1">
+                  <view class="button_7 flex-col" @click.stop="goKmCg(ghsInfo)" v-if="ghsInfo.openKmCg && ghsInfo.openKmCg == 1"><text class="text_13">昆明直采</text></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>
                 </block>
                 <block v-else>
-                  <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
-                    满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
-                  </text>
+                  <view class="button_6 flex-col" @click="fillCg(ghsInfo)"><text class="text_13">录采购单</text></view>
                 </block>
-</block>
-
-              </text>
-            </view>
-          </view>
-          <view class="box_4 flex-col"></view>
-          <view class="box_9">
-            <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?ghsId='+ghsInfo.id+'&ghsName='+ghsInfo.name})"> <text>买花记录</text> </view>
-            <view class="tag_2" @click.stop="callUp(ghsInfo)" style="color:green;font-weight:bold;"> <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">
-              <text class="waite_clear_order">
-                待结订单 {{ghsInfo.debtNum}}笔 合计¥{{ghsInfo.debtAmount?parseFloat(ghsInfo.debtAmount):0}}
-                <text style="margin-left:30upx;" v-if="ghsInfo.remainDebtAmount>0">选订单结 》</text>
-              </text>
-            </view>
-          </view>
-
-          <block v-if="Number(ghsInfo.balance)>0">
-            <view class="box_6 flex-row" v-if="ghsInfo.remainDebtAmount>0" @click.stop="recharge(ghsInfo)">
-              <view class="show_clear_area flex-row justify-between">
-                <text class="waite_clear_order" style="color:#3385ff;">
-                    <text v-if="Number(ghsInfo.balance)>0">减去余额¥{{ ghsInfo.balance ? parseFloat(ghsInfo.balance) : 0 }}</text>
-                    <text v-if="ghsInfo.remainDebtAmount>0" style="margin-left:15upx;">实欠¥{{ ghsInfo.remainDebtAmount }}</text>
-                    <text style="margin-left:30upx;">按金额结 》</text>
-                </text>
+                <text style="position:absolute;left:677upx;top:17upx;color:#CCCCCC;" @click.stop="getMore(ghsInfo)">更多</text>
               </view>
-            </view>
-
-            <view class="box_6 flex-row" v-if="ghsInfo.remainDebtAmount<0" @click.stop="recharge(ghsInfo)">
-              <view class="show_clear_area flex-row justify-between">
-                <text class="waite_clear_order" style="color:#3385ff;">
-                    <text>账户余额¥{{ Math.abs(ghsInfo.remainDebtAmount) }}</text>
-                    <text style="margin-left:30upx;">已结清</text>
-                </text>
-              </view>
-            </view>
-          </block>
+          </view>
+        </template>
+        <block v-else>
+          <view style="margin:60upx auto 40upx auto;font-weight:bold;font-size:36upx;text-align: center;">暂无供货商</view>
+        </block>
 
-          <block v-if="ghsInfo.live == 1">
-            <view class="button_7 flex-col" @click.stop="goKmCg(ghsInfo)" v-if="ghsInfo.openKmCg && ghsInfo.openKmCg == 1"><text class="text_13">昆明直采</text></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>
-          </block>
-          <block v-else>
-            <view class="button_6 flex-col" @click="fillCg(ghsInfo)"><text class="text_13">录采购单</text></view>
-          </block>
-          <text style="position:absolute;left:677upx;top:17upx;color:#CCCCCC;" @click.stop="getMore(ghsInfo)">更多</text>
+        <view style="text-align:center;margin-top:50upx;margin-bottom:182upx;color:#827171;font-size:28upx;">
+          <text style="margin-right:20upx;">中花汇提供技术支持</text>
+          <text style="margin-right:20upx;">|</text>
+          <text @click="toPhone()">联系软件公司</text>
         </view>
-    </view>
-
-  </template>
-  <block v-else>
-    <view style="margin:60upx auto 40upx auto;font-weight:bold;font-size:36upx;text-align: center;">暂无供货商</view>
-  </block>
-
-  <view style="text-align:center;margin-top:50upx;margin-bottom:182upx;color:#827171;font-size:28upx;">
-    <text style="margin-right:20upx;">中花汇提供技术支持</text>
-    <text style="margin-right:20upx;">|</text>
-    <text @click="toPhone()">联系软件公司</text>
-  </view>
-  </view>
-
-  </view>
 
+      </view>
+    </view>
   </block>
-
-
   <uni-popup ref="toShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
-			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
-        <view style="width:100vw;margin-top:8upx;"><button @click="rechargeChange()">充值记录</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="balanceChange()">余额变动</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="bpSj()">屏蔽此商家</button></view>
-				<view style="width:100vw;margin-top:30upx;"><button @click="closeToShow()">取消</button></view>
-			</view>
-		</uni-popup>
-
+    <view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+      <view style="width:100vw;margin-top:8upx;"><button @click="rechargeChange()">充值记录</button></view>
+      <view style="width:100vw;margin-top:8upx;"><button @click="balanceChange()">余额变动</button></view>
+      <view style="width:100vw;margin-top:8upx;"><button @click="bpSj()">屏蔽此商家</button></view>
+      <view style="width:100vw;margin-top:30upx;"><button @click="closeToShow()">取消</button></view>
+    </view>
+  </uni-popup>
 
+  <!-- 多供货商提示弹框 -->
+  <uni-popup ref="supplierNoticePopup" background-color="#fff" type="center" :animation="true" class="supplier-notice-popup">
+    <view class="supplier-notice-container">
+      <!-- 头部 -->
+      <view class="supplier-notice-header">
+        <text class="supplier-notice-title">您已有多个供货商</text>
+      </view>
+      
+      <!-- 中间供货商列表 -->
+      <view class="supplier-notice-content">
+        <view class="supplier-list">
+          <view class="supplier-item" v-for="(supplier, index) in displaySupplierList" :key="index">
+            <view class="supplier-icon">🏪</view>
+            <text class="supplier-name">{{ supplier.name }}</text>
+          </view>
+        </view>
+      </view>
+      
+      <!-- 底部提示 -->
+      <view class="supplier-notice-footer">
+        <text class="supplier-notice-tip">买花时注意区分,避免下错</text>
+        <view class="supplier-notice-buttons">
+          <button class="admin-button-com default" @click="remindLater">下次提醒</button>
+          <button class="admin-button-com blue" @click="closeSupplierNotice">知道了</button>
+        </view>
+      </view>
+    </view>
+  </uni-popup>
 </view>
 </template>
 <script>
@@ -288,7 +293,7 @@ import { consoleIndex } from "@/api/workbench";
 import NotLogin from "@/components/not-login";
 import autoUpdateMixins from "@/mixins/autoUpdate";
 import { ghsList } from "@/api/purchase";
-import { changeDelStatus } from "@/api/ghs";
+import { changeDelStatus,hasMoreGhs } from "@/api/ghs";
 import {currentShop} from "@/api/shop";
 import { clearLogin,hasNotice } from "@/api/admin";
 export default {
@@ -339,7 +344,8 @@ export default {
       backAction:'',
       countStat:{systemIncome:0,systemCount:0,debtCount:0,debtIncome:0,kfWxCount:0,kfWxIncome:0},
       lookMoney:1,
-      currentGhs:{}
+      currentGhs:{},
+      displaySupplierList: [] // 用于显示在弹框中的供货商列表
     };
   },
   computed: {
@@ -353,6 +359,7 @@ export default {
             if(Number(newVal.onlyCg) == 1){
               this.loginStyle  = 1
               uni.hideTabBar()
+              this.toRemindCustom()
             }else{
               this.loginStyle  = 2
               uni.showTabBar()
@@ -371,7 +378,6 @@ export default {
         this.init()
       }
       if(this.backAction == 'cacelMask'){
-        console.log(this.backAction)
         this.init()
         this.backAction = ''
       }
@@ -381,6 +387,7 @@ export default {
             if(Number(this.loginInfo.onlyCg) == 1){
               this.loginStyle  = 1
               uni.hideTabBar()
+              this.toRemindCustom()
             }else{
               this.loginStyle  = 2
               uni.showTabBar()
@@ -395,6 +402,23 @@ 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')
@@ -590,15 +614,6 @@ export default {
         this.supplierList = res.data.list
         this.ad = res.data.ad ? res.data.ad : []
         this.showAd = res.data.showAd ? res.data.showAd : 0
-
-        let needNotice = res.data.needNotice ? res.data.needNotice : 0
-        if(needNotice == 1){
-          this.$util.confirmModal({content:'你已有多个供货商,下单时注意区别,不要下错了哦',okText:'知道了'},() => {
-            hasNotice().then(res=>{
-            })
-          })
-        }
-
       })
     },
     goGd(){
@@ -661,9 +676,16 @@ export default {
             that.overview = res.data.overview
           }
         })
-
         this.showShopName()
-
+    },
+    toRemindCustom(){
+        if(this.loginStyle==1){
+          hasMoreGhs().then(ret=>{
+            if(ret.data.needNotice == 1){
+              this.showSupplierNotice()
+            }
+          })
+        }
     },
     noticeFn (item) {
       this.$util.pageTo({ url: item.page })
@@ -875,15 +897,6 @@ export default {
     }
   }
 }
-// 遮罩层
-.renew-wrap {
-  text-align: center;
-  .renew-wrap-text {
-    margin-top: 30upx;
-    margin-bottom: 60upx;
-    font-size: 34upx;
-  }
-}
 .order-page {
 .ghs_list_page {
   background-color: rgba(255, 255, 255, 1);
@@ -898,86 +911,18 @@ export default {
     display: flex;
     flex-direction: row;
   }
-  .justify-start {
-      display: flex;
-      justify-content: flex-start;
-    }
-  .justify-center {
-      display: flex;
-      justify-content: center;
-  }
-    
   .justify-end {
       display: flex;
       justify-content: flex-end;
   }
-  .justify-evenly {
-      display: flex;
-      justify-content: space-evenly;
-  }
-  .justify-around {
-      display: flex;
-      justify-content: space-around;
-  }
   .justify-between {
       display: flex;
       justify-content: space-between;
   }
-  .align-start {
-      display: flex;
-      align-items: flex-start;
-  }
-  .align-center {
-      display: flex;
-      align-items: center;
-  }
-  .align-end {
-      display: flex;
-      align-items: flex-end;
-  }
 
   .ghs_list_area {
     width: 750upx;
     background-color: #ece5e5;
-    .group_1 {
-      box-shadow: 0px 1px 0px 0px rgba(221, 221, 221, 1);
-      background-color: rgba(255, 255, 255, 1);
-      width: 750upx;
-      height: 128upx;
-      margin-top: 2upx;
-      .image_1 {
-        width: 727upx;
-        height: 20upx;
-        margin: 11upx 0 0 12upx;
-      }
-      .block_4 {
-        width: 714upx;
-        height: 64upx;
-        margin: 21upx 0 12upx 24upx;
-        .icon_1 {
-          width: 20upx;
-          height: 34upx;
-          margin-top: 16upx;
-        }
-        .text_1 {
-          width: 107upx;
-          height: 34upx;
-          overflow-wrap: break-word;
-          color: rgba(4, 4, 4, 1);
-          font-size: 36upx;
-          font-family: PingFangSC-Semibold;
-          text-align: left;
-          white-space: nowrap;
-          line-height: 24upx;
-          margin: 15upx 0 0 278upx;
-        }
-        .applet-top-bar_1 {
-          width: 174upx;
-          height: 64upx;
-          margin-left: 135upx;
-        }
-      }
-    }
     .ghs_box {
       background-color: rgba(255, 255, 255, 1);
       position: relative;
@@ -1049,47 +994,9 @@ export default {
           float:left;
           padding-left:15upx;
           padding-right:15upx;
+                  }
         }
-        .tag_3 {
-          background-color: rgba(255, 255, 255, 1);
-          border-radius: 8px;
-          height: 60upx;
-          border: 1px solid rgba(221, 221, 221, 1);
-          margin-left: 12upx;
-          width: 140upx;
-          .text_11 {
-            width: 101upx;
-            height: 25upx;
-            overflow-wrap: break-word;
-            color: rgba(51, 51, 51, 1);
-            font-size: 26upx;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 25upx;
-            margin: 17upx 0 0 20upx;
-          }
-        }
-        .tag_4 {
-          background-color: rgba(255, 255, 255, 1);
-          border-radius: 8px;
-          height: 60upx;
-          border: 1px solid rgba(221, 221, 221, 1);
-          margin-left: 12upx;
-          width: 192upx;
-          .text_12 {
-            width: 153upx;
-            height: 25upx;
-            overflow-wrap: break-word;
-            color: rgba(51, 51, 51, 1);
-            font-size: 26upx;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 25upx;
-            margin: 17upx 0 0 18upx;
-          }
-        }
-      }
-      .box_6 {
+        .box_6 {
         background-color: rgb(248, 242, 242);
         width: 750upx;
         height:95upx;
@@ -1097,11 +1004,6 @@ export default {
           width: 247upx;
           height: 29upx;
           margin: 26upx 0 0 30upx;
-          .icon_2 {
-            width: 22upx;
-            height: 26upx;
-            margin-top: 2upx;
-          }
           .waite_clear_order {
             width: 214upx;
             height: 29upx;
@@ -1114,29 +1016,8 @@ export default {
             line-height: 29upx;
           }
         }
-        .image-text_9 {
-          width: 134upx;
-          height: 27upx;
-          margin: 26upx 29upx 0 310upx;
-          .text-group_4 {
-            width: 111upx;
-            height: 27upx;
-            overflow-wrap: break-word;
-            color: rgba(255, 40, 66, 1);
-            font-size: 30upx;
-            font-weight:bold;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 27upx;
-          }
-          .icon_3 {
-            width: 14upx;
-            height: 24upx;
-            margin-top: 2upx;
-          }
         }
-      }
-      .button_4 {
+        .button_4 {
         height: 80upx;
         line-height:80upx;
         text-align:center;
@@ -1208,4 +1089,97 @@ export default {
   }
 }
 }
+
+/* 供货商提示弹框样式 */
+.supplier-notice-popup {
+  .supplier-notice-container {
+    width: 650upx;
+    background-color: #fff;
+    border-radius: 20upx;
+    overflow: hidden;
+    
+    .supplier-notice-header {
+      padding: 40upx 30upx 20upx;
+      text-align: center;
+      background-color: #f8f9fa;
+      border-bottom: 1upx solid #e9ecef;
+      
+      .supplier-notice-title {
+        font-size: 36upx;
+        font-weight: bold;
+        color: #333;
+      }
+    }
+    
+    .supplier-notice-content {
+      padding: 20upx 0;
+      
+      .supplier-list {
+        padding: 0 30upx;
+        
+        .supplier-item {
+          display: flex;
+          align-items: center;
+          padding: 20upx 0;
+          border-bottom: 1upx solid #f0f0f0;
+          
+          &:last-child {
+            border-bottom: none;
+          }
+          
+          .supplier-icon {
+            width: 60upx;
+            height: 60upx;
+            background-color: #e3f2fd;
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 32upx;
+            margin-right: 20upx;
+          }
+          
+          .supplier-name {
+            font-size: 32upx;
+            color: #333;
+            flex: 1;
+            font-weight: 500;
+          }
+        }
+      }
+    }
+    
+    .supplier-notice-footer {
+      padding: 30upx;
+      text-align: center;
+      background-color: #f8f9fa;
+      border-top: 1upx solid #e9ecef;
+      
+      .supplier-notice-tip {
+        display: block;
+        font-size: 40upx;
+        font-weight: bold;
+        color: red;
+        margin-bottom: 30upx;
+        line-height: 1.4;
+      }
+      
+      .supplier-notice-buttons {
+        display: flex;
+        justify-content: space-between;
+        gap: 20upx;
+        
+        .admin-button-com {
+          flex: 1;
+          margin: 0;
+          padding: 20upx 0;
+          height: auto;
+          line-height: normal;
+          font-size: 34upx;
+          font-weight: bold;
+        }
+      }
+    }
+  }
+}
 </style>

+ 4 - 0
hdApp/src/api/ghs/index.js

@@ -1,5 +1,9 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const hasMoreGhs = data => {
+	return https.get('/ghs/remind-more-ghs', data)
+}
+
 export const getGhsData = data => {
 	return https.get('/ghs/get-ghs-data', data)
 }

+ 157 - 149
hdApp/src/pagesPurchase/order.vue

@@ -134,12 +134,41 @@
 			</view>
 		  </uni-popup>
 
+  <!-- 多供货商提示弹框 -->
+  <uni-popup ref="supplierNoticePopup" background-color="#fff" type="center" :animation="true" class="supplier-notice-popup">
+    <view class="supplier-notice-container">
+      <!-- 头部 -->
+      <view class="supplier-notice-header">
+        <text class="supplier-notice-title">您已有多个供货商</text>
+      </view>
+      
+      <!-- 中间供货商列表 -->
+      <view class="supplier-notice-content">
+        <view class="supplier-list">
+          <view class="supplier-item" v-for="(supplier, index) in displaySupplierList" :key="index">
+            <view class="supplier-icon">🏪</view>
+            <text class="supplier-name">{{ supplier.name }}</text>
+          </view>
+        </view>
+      </view>
+      
+      <!-- 底部提示 -->
+      <view class="supplier-notice-footer">
+        <text class="supplier-notice-tip">买花时注意区分,避免下错</text>
+        <view class="supplier-notice-buttons">
+          <button class="admin-button-com default" @click="remindLater">下次提醒</button>
+          <button class="admin-button-com blue" @click="closeSupplierNotice">知道了</button>
+        </view>
+      </view>
+    </view>
+  </uni-popup>
+
   </view>
 </template>
 <script>
 import { mapGetters } from "vuex";
 import { ghsList } from "@/api/purchase";
-import { changeDelStatus } from "@/api/ghs";
+import { changeDelStatus,hasMoreGhs } from "@/api/ghs";
 import { hasNotice } from "@/api/admin";
 export default {
   components: {
@@ -148,12 +177,12 @@ export default {
     return {
       supplierList: [],
       ad:[],
-      showAd:1,
-      currentGhs:{}
+      currentGhs:{},
+      displaySupplierList: [] // 用于显示在弹框中的供货商列表
     }
   },
   onPullDownRefresh() {
-    this.getGhsList().then(res => {
+    this.getMyGhsData().then(res => {
       uni.stopPullDownRefresh();
     })
   },
@@ -164,6 +193,23 @@ 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')
@@ -236,7 +282,7 @@ export default {
       changeDelStatus({delStatus:1,ghsId:ghs.id}).then(res=>{
         if(res.code == 1){
           that.closeToShow()
-          that.getGhsList()
+          that.getMyGhsData()
         }
       })
     },
@@ -271,22 +317,21 @@ export default {
       this.$util.confirmModal({content:'付款金额不足消欠款单时,存为余额下次使用'},() => {})
     },
     init() {
-      this.getGhsList()
+      this.getMyGhsData().then(() => {
+        this.toRemindCustom()
+      })
+    },
+    toRemindCustom(){
+      hasMoreGhs().then(ret=>{
+        if(ret.data.needNotice == 1){
+          this.showSupplierNotice()
+        }
+      })
     },
-    getGhsList () {
+    getMyGhsData () {
       return ghsList().then(res => {
         this.supplierList = res.data.list
         this.ad = res.data.ad ? res.data.ad : []
-        this.showAd = res.data.showAd ? res.data.showAd : 0
-
-        let needNotice = res.data.needNotice ? res.data.needNotice : 0
-        if(needNotice == 1){
-          this.$util.confirmModal({content:'你已有多个供货商,下单时注意区别,不要下错了哦',okText:'知道了'},() => {
-            hasNotice().then(res=>{
-            })
-          })
-        }
-
       })
     },
     settleAccounts (item) {
@@ -312,87 +357,20 @@ export default {
     display: flex;
     flex-direction: row;
   }
-  .justify-start {
-      display: flex;
-      justify-content: flex-start;
-    }
-  .justify-center {
-      display: flex;
-      justify-content: center;
-  }
-    
   .justify-end {
       display: flex;
       justify-content: flex-end;
   }
-  .justify-evenly {
-      display: flex;
-      justify-content: space-evenly;
-  }
-  .justify-around {
-      display: flex;
-      justify-content: space-around;
-  }
   .justify-between {
       display: flex;
       justify-content: space-between;
   }
-  .align-start {
-      display: flex;
-      align-items: flex-start;
-  }
-  .align-center {
-      display: flex;
-      align-items: center;
-  }
-  .align-end {
-      display: flex;
-      align-items: flex-end;
-  }
 
   .ghs_list_area {
     width: 750upx;
     background-color: #ece5e5;
     margin-bottom:40upx;
-    .group_1 {
-      box-shadow: 0px 1px 0px 0px rgba(221, 221, 221, 1);
-      background-color: rgba(255, 255, 255, 1);
-      width: 750upx;
-      height: 128upx;
-      margin-top: 2upx;
-      .image_1 {
-        width: 727upx;
-        height: 20upx;
-        margin: 11upx 0 0 12upx;
-      }
-      .block_4 {
-        width: 714upx;
-        height: 64upx;
-        margin: 21upx 0 12upx 24upx;
-        .icon_1 {
-          width: 20upx;
-          height: 34upx;
-          margin-top: 16upx;
-        }
-        .text_1 {
-          width: 107upx;
-          height: 34upx;
-          overflow-wrap: break-word;
-          color: rgba(4, 4, 4, 1);
-          font-size: 36upx;
-          font-family: PingFangSC-Semibold;
-          text-align: left;
-          white-space: nowrap;
-          line-height: 24upx;
-          margin: 15upx 0 0 278upx;
-        }
-        .applet-top-bar_1 {
-          width: 174upx;
-          height: 64upx;
-          margin-left: 135upx;
-        }
-      }
-    }
+
     .ghs_box {
       background-color: rgba(255, 255, 255, 1);
       position: relative;
@@ -466,44 +444,7 @@ export default {
           padding-left:15upx;
           padding-right:15upx;
         }
-        .tag_3 {
-          background-color: rgba(255, 255, 255, 1);
-          border-radius: 8px;
-          height: 60upx;
-          border: 1px solid rgba(221, 221, 221, 1);
-          margin-left: 12upx;
-          width: 140upx;
-          .text_11 {
-            width: 101upx;
-            height: 25upx;
-            overflow-wrap: break-word;
-            color: rgba(51, 51, 51, 1);
-            font-size: 26upx;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 25upx;
-            margin: 17upx 0 0 20upx;
-          }
-        }
-        .tag_4 {
-          background-color: rgba(255, 255, 255, 1);
-          border-radius: 8px;
-          height: 60upx;
-          border: 1px solid rgba(221, 221, 221, 1);
-          margin-left: 12upx;
-          width: 192upx;
-          .text_12 {
-            width: 153upx;
-            height: 25upx;
-            overflow-wrap: break-word;
-            color: rgba(51, 51, 51, 1);
-            font-size: 26upx;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 25upx;
-            margin: 17upx 0 0 18upx;
-          }
-        }
+
       }
       .box_6 {
         background-color: rgb(248, 242, 242);
@@ -513,11 +454,6 @@ export default {
           width: 247upx;
           height: 29upx;
           margin: 26upx 0 0 30upx;
-          .icon_2 {
-            width: 22upx;
-            height: 26upx;
-            margin-top: 2upx;
-          }
           .waite_clear_order {
             width: 214upx;
             height: 29upx;
@@ -530,27 +466,6 @@ export default {
             line-height: 29upx;
           }
         }
-        .image-text_9 {
-          width: 134upx;
-          height: 27upx;
-          margin: 26upx 29upx 0 310upx;
-          .text-group_4 {
-            width: 111upx;
-            height: 27upx;
-            overflow-wrap: break-word;
-            color: rgba(255, 40, 66, 1);
-            font-size: 30upx;
-            font-weight:bold;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 27upx;
-          }
-          .icon_3 {
-            width: 14upx;
-            height: 24upx;
-            margin-top: 2upx;
-          }
-        }
       }
       .button_4 {
         height: 80upx;
@@ -627,4 +542,97 @@ export default {
     }
   }
 }
+
+/* 供货商提示弹框样式 */
+.supplier-notice-popup {
+  .supplier-notice-container {
+    width: 650upx;
+    background-color: #fff;
+    border-radius: 20upx;
+    overflow: hidden;
+    
+    .supplier-notice-header {
+      padding: 40upx 30upx 20upx;
+      text-align: center;
+      background-color: #f8f9fa;
+      border-bottom: 1upx solid #e9ecef;
+      
+      .supplier-notice-title {
+        font-size: 36upx;
+        font-weight: bold;
+        color: #333;
+      }
+    }
+    
+    .supplier-notice-content {
+      padding: 20upx 0;
+      
+      .supplier-list {
+        padding: 0 30upx;
+        
+        .supplier-item {
+          display: flex;
+          align-items: center;
+          padding: 20upx 0;
+          border-bottom: 1upx solid #f0f0f0;
+          
+          &:last-child {
+            border-bottom: none;
+          }
+          
+          .supplier-icon {
+            width: 60upx;
+            height: 60upx;
+            background-color: #e3f2fd;
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 32upx;
+            margin-right: 20upx;
+          }
+          
+          .supplier-name {
+            font-size: 32upx;
+            color: #333;
+            flex: 1;
+            font-weight: 500;
+          }
+        }
+      }
+    }
+    
+    .supplier-notice-footer {
+      padding: 30upx;
+      text-align: center;
+      background-color: #f8f9fa;
+      border-top: 1upx solid #e9ecef;
+      
+      .supplier-notice-tip {
+        display: block;
+        font-size: 40upx;
+        font-weight: bold;
+        color: red;
+        margin-bottom: 30upx;
+        line-height: 1.4;
+      }
+      
+      .supplier-notice-buttons {
+        display: flex;
+        justify-content: space-between;
+        gap: 20upx;
+        
+        .admin-button-com {
+          flex: 1;
+          margin: 0;
+          padding: 20upx 0;
+          height: auto;
+          line-height: normal;
+          font-size: 34upx;
+          font-weight: bold;
+        }
+      }
+    }
+  }
+}
 </style>