新增

pages/goods_details/index.vue

@@ -813,6 +813,14 @@ const selecAttr = () => {
 const handleSubmit = async () => {
   if (!isLogin.value) {
     return toLogin();
+  }else{
+    if(appStore.userInfo.merchant){
+      uni.showToast({
+        title:'商家用户不能下单！',
+        icon:'none',
+      })
+      return ;
+    }
   }
 
   const productSelect = productValue.value[attrValue.value];

pages/order_addcart/order_addcart.vue

@@ -781,6 +781,14 @@ function subCollect(event) {
 }
 
 function subOrder(event) {
+
+  if(appStore.userInfo.merchant){
+    uni.showToast({
+      title:'商家用户不能下单！',
+      icon:'none',
+    })
+    return ;
+  }
   const selectValueArr = selectValue.value;
   if (selectValueArr.length > 0) {
     // 检查是否选择了多个商家的商品

pages/users/user_goods_collection/index.vue

@@ -10,9 +10,9 @@
       </view>
       <!-- #endif -->
       <view class="list">
-        <checkbox-group @change="checkboxChange" class="centent" activeColor="#ffe079">
-          <view v-for="(item,index) in collectProductList" :key="index" class='item acea-row row-middle'>
-            <checkbox :value="item.id.toString()" :checked="item.checked" v-if="!footerswitch"
+        <up-checkbox-group shape="circle" @change="checkboxChange" class="centent" activeColor="#ffe079">
+          <view v-for="(item,index) in collectProductList" :key="index" class='item acea-row row-middle' style="width: 100%;">
+            <up-checkbox :value="item.id.toString()" :checked="item.checked" v-if="!footerswitch"
                       style="margin-right: 10rpx;" activeColor="#ffe079" />
             <navigator :url='"/pages/goods_details/index?id="+item.productId' hover-class='none'
                        class="acea-row">
@@ -25,17 +25,17 @@
               </view>
             </navigator>
           </view>
-        </checkbox-group>
+        </up-checkbox-group>
       </view>
       <view class='loadingicon acea-row row-center-wrapper'>
         <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
       </view>
       <view v-if="!footerswitch" class='footer acea-row row-between-wrapper'>
         <view>
-          <checkbox-group @change="checkboxAllChange">
-            <checkbox value="all" :checked="!!isAllSelect" />
+          <up-checkbox-group shape="circle" @change="checkboxAllChange">
+            <up-checkbox value="all" :checked="!!isAllSelect" />
             <text class='checkAll'>全选</text>
-          </checkbox-group>
+          </up-checkbox-group>
         </view>
         <view class='button acea-row row-middle'>
           <form @submit="delCollectionAll" report-submit='true'>