Merge branch 'master' of git.huaml.com:zhh/front-end

hdApp/src/admin/home/workbench.vue

@@ -396,7 +396,7 @@
     <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:8upx;"><button @click="bpSj()">屏蔽此商家</button></view> -->
       <view style="width:100vw;margin-top:30upx;"><button @click="closeToShow()">取消</button></view>
     </view>
   </uni-popup>

hdApp/src/pagesPurchase/order.vue

@@ -129,7 +129,7 @@
 			<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:8upx;"><button @click="bpSj()">屏蔽此商家</button></view> -->
 				<view style="width:100vw;margin-top:30upx;"><button @click="closeToShow()">取消</button></view>
 			</view>
 		  </uni-popup>

mallApp/src/pages/home/recent.vue

@@ -167,12 +167,12 @@
               <view class="action-btn primary" @click.stop="bug(item)">
                 <text class="btn-text">🌸 花材绿植</text>
               </view>
-              <view class="action-btn secondary" @click.stop="hs(item)">
-                <text class="btn-text">💐 花束商城</text>
-              </view>
               <view class="action-btn tertiary" @click.stop="tj(item)">
                 <text class="btn-text">📷 花束相册</text>
               </view>
+              <view class="action-btn secondary" @click.stop="hs(item)">
+                <text class="btn-text">💐 花束商城</text>
+              </view>
             </view>
 
             <!-- 记录查询按钮 -->