更新

hdApp/src/admin/home/workbench.vue

@@ -49,117 +49,119 @@
   
             <view v-if="!$util.isEmpty(data.warning)" class="warning-banner">{{ 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>
-            </block>
-          </template>
-  
-          <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">
+            <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>
+              </block>
+            </template>
   
-                        <block v-if="ghsInfo.cutStyle && ghsInfo.cutStyle == 1">
-                          <block v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
-                            <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
-                              满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text>
-                              <text v-if="ghsInfo.meetAmount>0"><text v-if="ghsInfo.meetNum>0">和</text>{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
-                            </text>
+            <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>0 || ghsInfo.meetAmount>0">
+                              <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
+                                满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text>
+                                <text v-if="ghsInfo.meetAmount>0"><text v-if="ghsInfo.meetNum>0">和</text>{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                              </text>
+                            </block>
                           </block>
-                        </block>
-                        <block v-else>
-                          <block v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
-                            <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
-                              满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text>
-                              <text v-if="ghsInfo.meetAmount>0"><text v-if="ghsInfo.meetNum>0">和</text>{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
-                            </text>
+                          <block v-else>
+                            <block v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
+                              <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
+                                满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text>
+                                <text v-if="ghsInfo.meetAmount>0"><text v-if="ghsInfo.meetNum>0">和</text>{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                              </text>
+                            </block>
                           </block>
-                        </block>
-  
-                      </text>
+    
+                        </text>
+                      </view>
                     </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" style="position:relative;" @click="pageTo({url:'/pagesPurchase/shopping?ghsId='+ghsInfo.id+'&ghsName='+ghsInfo.name})"> 
-                      <text>买花记录</text> 
-                      
-                      <!-- 买花记录提示 -->
-                      <view class="inline-bought-tooltip-box" v-if="showBoughtTooltip && index === 0" @click.stop="closeBoughtTooltip">
-                        <view class="bought-tooltip-content">
-                          买花记录 请在这里查看
-                          <text class="close-tooltip-icon">×</text>
+                    <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" style="position:relative;" @click="pageTo({url:'/pagesPurchase/shopping?ghsId='+ghsInfo.id+'&ghsName='+ghsInfo.name})"> 
+                        <text>买花记录</text> 
+                        
+                        <!-- 买花记录提示 -->
+                        <view class="inline-bought-tooltip-box" v-if="showBoughtTooltip && index === 0" @click.stop="closeBoughtTooltip">
+                          <view class="bought-tooltip-content">
+                            买花记录 请在这里查看
+                            <text class="close-tooltip-icon">×</text>
+                          </view>
+                          <view class="bought-tooltip-arrow"></view>
                         </view>
-                        <view class="bought-tooltip-arrow"></view>
-                      </view>
 
-                    </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>
                       </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" v-if="ghsInfo.remainDebtAmount<0" @click.stop="recharge(ghsInfo)">
+                    <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" style="color:#3385ff;">
-                            <text>账户余额¥{{ Math.abs(ghsInfo.remainDebtAmount) }}</text>
-                            <text style="margin-left:30upx;">已结清</text>
+                        <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>
+    
+                    <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>
+                        </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>
+    
+                    <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>
+              </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>
+            <view style="text-align:center;margin-top:50upx;margin-bottom:50upx;color:#827171;font-size:30upx;">
+              <text>厦门中花汇技术支持</text>
             </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:50upx;color:#827171;font-size:30upx;">
-            <text style="margin-right:20upx;" @click="toPhone()">厦门中花汇技术支持</text>
-          </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>
@@ -189,7 +191,7 @@
         
         <!-- 底部提示 -->
         <view class="supplier-notice-footer">
-          <text class="supplier-notice-tip">买花时注意区分，避免下错</text>
+          <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>
@@ -197,22 +199,8 @@
         </view>
       </view>
     </uni-popup>
-    
-    <!-- 商城选项弹框 -->
-    <uni-popup ref="mallOptionsPopup" type="center" mask-background-color="rgba(0,0,0,0.4)">
-      <view class="mall-options-container">
-        <view class="mall-options-buttons">
-          <view class="mall-option-btn" @click="copyMallLink">
-            <view class="option-icon">📋</view>
-            <text class="option-text">复制链接</text>
-          </view>
-          <view class="mall-option-btn" @click="openMallDirect">
-            <view class="option-icon">🚀</view>
-            <text class="option-text">直接打开</text>
-          </view>
-        </view>
-      </view>
-    </uni-popup>
+
+
   </view>
   </template>
   <script>
@@ -639,15 +627,6 @@
       goToProfit () {
         this.$util.pageTo({url:'/admin/stat/profit'})
       },
-      // 显示商城选项弹框
-      showMallOptions(no) {
-        this.urlNo = no
-        this.$refs.mallOptionsPopup.open('center')
-      },
-      // 关闭商城选项弹框
-      closeMallOptions() {
-        this.$refs.mallOptionsPopup.close()
-      },
       // 直接打开商城
       openMallDirect() {
         this.closeMallOptions()
@@ -1436,13 +1415,13 @@
         
         .supplier-notice-tip {
           display: block;
-          font-size: 40upx;
+          font-size: 42upx;
           font-weight: bold;
           color: red;
           margin-bottom: 30upx;
           line-height: 1.4;
         }
-        
+
         .supplier-notice-buttons {
           display: flex;
           justify-content: space-between;

hdApp/src/pagesClient/official/result.vue

@@ -1,79 +1,31 @@
 <template>
 	<appResult title="注册成功">
-    <view class="dec"></view>
-    <view v-if="fromCg == 1">
-      <button class="admin-button-com blue big" @click="beginCg()" >开始买花</button>
-    </view>
-    <view v-else>
-      <button class="admin-button-com blue big" v-if="scene==''" @click="beginCg()" style="padding-left:80upx;padding-right:80upx;">进入首页</button>
-      <button class="admin-button-com blue big" v-else @click="beginCg()" >开始买花</button>
+    <view>
+      <button class="admin-button-com blue big" @click="beginBuy()" >去买花</button>
     </view>
 	</appResult>
 </template>
 <script>
 import appResult from '@/components/app-result'
 export default {
-	name: "ApplyResult",
+	name: "result",
 	components:{
 		appResult
     },
     data(){
       return {
-        scene:'',
-        fromCg:0
-      }
-    },
-    onUnload() {
-    },
-    onLoad () {
-      //供货商打开小程序分享给客户，客户需要采购进来
-      let ghsCgOption = uni.getStorageSync('ghsCgOption')
-      if(ghsCgOption.fromCg){
-        this.fromCg = ghsCgOption.fromCg
-      }
-      //供货商打开太阳码分享给客户，客户需要采购进来
-      let scene = uni.getStorageSync('ghsCgScene')
-      if(scene){
-        this.scene = scene
+        scene:''
       }
     },
     methods:{
       init(){
-
-      },
-      beginCg(){
-        if(this.fromCg == 1){
-          // #ifdef APP-PLUS
-          this.$util.pageTo({url: "/admin/home/workbench", type:3})
-          // #endif
-          // #ifdef MP-WEIXIN
-          let ghsCgOption = uni.getStorageSync('ghsCgOption')
-          this.$util.pageTo({url: "/pagesPurchase/ghsProduct", query:ghsCgOption, type:2})
-          // #endif
-        }else{
-          // #ifdef APP-PLUS
-          this.$util.pageTo({url: "/admin/home/workbench", type:3})
-          // #endif
-          // #ifdef MP-WEIXIN
-          this.$util.pageTo({url: "/pagesPurchase/ghsProduct",query: {scene:this.scene},type:2})
-          // #endif
-        }
       },
-      goBack() {
-        uni.navigateBack()
+      beginBuy(){
+        this.$util.pageTo({url: "/admin/home/workbench", type:3})
       }
     }
 };
 </script>
 <style lang="scss" scoped>
-    .dec {
-     color: #666666;   
-     font-size: 28upx;
-     font-weight: 400;
-     margin-bottom: 30upx;
-    }
-	.admin-button-com {
-		margin-bottom: 20upx;
-		width: 100%;
-	}
+
 </style>