From 6e39585ef331f5f3e6e4880f3981648f5a3acb46 Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Tue, 21 Mar 2023 19:03:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8Fradio=E7=82=B9=E5=87=BB=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/commission/apply.vue                    | 43 +++++++-------
 pages/index/cart.vue                          | 39 ++++++-------
 pages/order/detail.vue                        |  4 +-
 pages/pay/components/account-type-select.vue  | 41 +++++++-------
 pages/user/goods-collect.vue                  | 44 +++++++--------
 pages/user/goods-log.vue                      | 56 +++++++++----------
 .../components/s-auth-modal/s-auth-modal.vue  | 47 ++++++++--------
 .../s-coupon-select/s-coupon-select.vue       | 17 +++---
 .../s-wallet-card/s-wallet-card.vue           |  6 +-
 9 files changed, 141 insertions(+), 156 deletions(-)

diff --git a/pages/commission/apply.vue b/pages/commission/apply.vue
index 841a5da..c27c3d5 100644
--- a/pages/commission/apply.vue
+++ b/pages/commission/apply.vue
@@ -58,29 +58,28 @@
             </uni-forms-item>
           </view>
         </uni-forms>
-        <radio-group @change="onChange" v-if="state.protocol?.status == 1">
-          <label class="ss-flex ss-m-t-20">
-            <radio
-              :checked="state.isAgree"
-              color="var(--ui-BG-Main)"
-              style="transform: scale(0.6)"
-            />
-            <view class="agreement-text ss-flex">
-              <view class="ss-m-r-4">勾选代表同意</view>
-              <view
-                class="tcp-text"
-                @tap.stop="
-                  sheep.$router.go('/pages/public/richtext', {
-                    id: state.protocol.id,
-                    title: state.protocol.title,
-                  })
-                "
-              >
-                《{{ state.protocol.title }}》
-              </view>
+        <label class="ss-flex ss-m-t-20" v-if="state.protocol?.status == 1" @tap="onChange">
+          <radio
+            :checked="state.isAgree"
+            color="var(--ui-BG-Main)"
+            style="transform: scale(0.6)"
+            @tap.stop="onChange"
+          />
+          <view class="agreement-text ss-flex">
+            <view class="ss-m-r-4">勾选代表同意</view>
+            <view
+              class="tcp-text"
+              @tap.stop="
+                sheep.$router.go('/pages/public/richtext', {
+                  id: state.protocol.id,
+                  title: state.protocol.title,
+                })
+              "
+            >
+              《{{ state.protocol.title }}》
             </view>
-          </label>
-        </radio-group>
+          </view>
+        </label>
         <su-fixed bottom placeholder>
           <view class="submit-box ss-flex ss-row-center ss-p-30">
             <button class="submit-btn ss-reset-button ui-BG-Main ui-Shadow-Main" @tap="submit">
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 9d71074..a9cf3fc 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -27,18 +27,14 @@
       <view class="cart-content ss-flex-1 ss-p-x-30 ss-m-b-40">
         <view class="goods-box ss-r-10 ss-m-b-14" v-for="item in state.list" :key="item.id">
           <view class="ss-flex ss-col-center">
-            <radio-group
-              @change="onSelectSingle(item.id)"
-              class="check-box ss-flex ss-col-center ss-p-l-10"
-            >
-              <label class="radio ss-flex">
-                <radio
-                  :checked="state.selectedIds.includes(item.id)"
-                  color="var(--ui-BG-Main)"
-                  style="transform: scale(0.8)"
-                />
-              </label>
-            </radio-group>
+            <label class="check-box ss-flex ss-col-center ss-p-l-10" @tap="onSelectSingle(item.id)">
+              <radio
+                :checked="state.selectedIds.includes(item.id)"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelectSingle(item.id)"
+              />
+            </label>
             <s-goods-item
               :title="item.goods.title"
               :img="item.sku_price.image || item.goods.image"
@@ -64,16 +60,15 @@
       <su-fixed bottom :val="48" placeholder v-if="state.list.length > 0" :isInset="false">
         <view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
           <view class="footer-left ss-flex ss-col-center">
-            <radio-group @change="onSelectAll" class="check-box ss-flex ss-col-center ss-p-r-30">
-              <label class="radio ss-flex">
-                <radio
-                  :checked="state.isAllSelected"
-                  color="var(--ui-BG-Main)"
-                  style="transform: scale(0.8)"
-                />
-                <view class="ss-m-l-8"> 全选 </view>
-              </label>
-            </radio-group>
+            <label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
+              <radio
+                :checked="state.isAllSelected"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelectAll"
+              />
+              <view class="ss-m-l-8"> 全选 </view>
+            </label>
             <text>合计：</text>
             <view class="text-price price-text">
               {{ state.totalPriceSelected }}
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index ffaaac2..693646c 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -199,10 +199,10 @@
       </view>
       <view
         class="notice-item ss-flex ss-row-between"
-        v-if="state.orderInfo.promo_discount_fee > 0"
+        v-if="state.orderInfo.total_discount_fee > 0"
       >
         <text class="title">优惠金额</text>
-        <text class="detail">¥{{ state.orderInfo.promo_discount_fee }}</text>
+        <text class="detail">¥{{ state.orderInfo.total_discount_fee }}</text>
       </view>
       <view class="notice-item all-rpice-item ss-flex ss-m-t-20">
         <text class="title">{{
diff --git a/pages/pay/components/account-type-select.vue b/pages/pay/components/account-type-select.vue
index 8ff4f5b..8bb351c 100644
--- a/pages/pay/components/account-type-select.vue
+++ b/pages/pay/components/account-type-select.vue
@@ -5,28 +5,25 @@
         <text class="modal-title ss-m-b-20">选择提现方式</text>
       </view>
       <view class="modal-content ss-flex-1 ss-p-b-100">
-        <view
-          class="container-list ss-p-l-34 ss-p-r-24 ss-flex ss-col-center ss-row-center"
-          v-for="(item, index) in typeList"
-          :key="index"
-        >
-          <view class="container-icon ss-flex ss-m-r-20">
-            <image :src="sheep.$url.static(item.icon)" />
-          </view>
-          <view class="ss-flex-1">{{ item.title }}</view>
-          <view class="radio">
-            <radio-group @change="onChange">
-              <label class="radio">
-                <radio
-                  :value="item.value"
-                  color="var(--ui-BG-Main)"
-                  :checked="item.value === state.currentValue"
-                  :disabled="!methods.includes(item.value)"
-                />
-              </label>
-            </radio-group>
-          </view>
-        </view>
+        <radio-group @change="onChange">
+          <label
+            class="container-list ss-p-l-34 ss-p-r-24 ss-flex ss-col-center ss-row-center"
+            v-for="(item, index) in typeList"
+            :key="index"
+          >
+            <view class="container-icon ss-flex ss-m-r-20">
+              <image :src="sheep.$url.static(item.icon)" />
+            </view>
+            <view class="ss-flex-1">{{ item.title }}</view>
+
+            <radio
+              :value="item.value"
+              color="var(--ui-BG-Main)"
+              :checked="item.value === state.currentValue"
+              :disabled="!methods.includes(item.value)"
+            />
+          </label>
+        </radio-group>
       </view>
       <view class="modal-footer ss-flex ss-row-center ss-col-center">
         <button class="ss-reset-button save-btn" @tap="onConfirm">确定</button>
diff --git a/pages/user/goods-collect.vue b/pages/user/goods-collect.vue
index f734a54..20c98d2 100644
--- a/pages/user/goods-collect.vue
+++ b/pages/user/goods-collect.vue
@@ -32,24 +32,23 @@
           :key="item.id"
         >
           <view class="ss-flex ss-col-center">
-            <radio-group
+            <label
               class="check-box ss-flex ss-col-center ss-p-l-10"
-              @change="onSelect(item.goods_id)"
-              v-show="state.editMode"
+              v-if="state.editMode"
+              @tap="onSelect(item.goods_id)"
             >
-              <label class="radio">
-                <radio
-                  :checked="state.selectedCollectList.includes(item.goods_id)"
-                  color="var(--ui-BG-Main)"
-                  style="transform: scale(0.8)"
-                />
-              </label>
-            </radio-group>
+              <radio
+                :checked="state.selectedCollectList.includes(item.goods_id)"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelect(item.goods_id)"
+              />
+            </label>
             <s-goods-item
               :title="item.goods.title"
               :img="item.goods.image"
-              price="666"
-              skuText="123"
+              :price="item.goods.price[0]"
+              :skuText="item.goods.subtitle"
               priceColor="#FF3000"
               :titleWidth="400"
               @tap="
@@ -66,16 +65,15 @@
       <su-fixed bottom :val="0" placeholder v-show="state.editMode">
         <view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
           <view class="footer-left ss-flex ss-col-center">
-            <radio-group @change="onSelectAll">
-              <label class="check-box ss-flex ss-col-center ss-p-r-30">
-                <radio
-                  :checked="state.selectAll"
-                  color="var(--ui-BG-Main)"
-                  style="transform: scale(0.7)"
-                />
-                <view> 全选 </view>
-              </label>
-            </radio-group>
+            <label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
+              <radio
+                :checked="state.selectAll"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.7)"
+                @tap.stop="onSelectAll"
+              />
+              <view> 全选 </view>
+            </label>
           </view>
           <view class="footer-right">
             <button
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
index b822581..76043db 100644
--- a/pages/user/goods-log.vue
+++ b/pages/user/goods-log.vue
@@ -35,24 +35,23 @@
           :key="item.id"
         >
           <view class="ss-flex ss-col-center">
-            <radio-group
-            v-show="state.editMode"
+            <label
               class="check-box ss-flex ss-col-center ss-p-l-10"
-              @change="onSelect(item.goods_id)"
+              v-if="state.editMode"
+              @tap="onSelect(item.goods_id)"
             >
-              <label class="radio">
-                <radio
-                  :checked="state.selectedCollectList.includes(item.goods_id)"
-                  color="var(--ui-BG-Main)"
-                  style="transform: scale(0.8)"
-                />
-              </label>
-            </radio-group>
+              <radio
+                :checked="state.selectedCollectList.includes(item.goods_id)"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelect(item.goods_id)"
+              />
+            </label>
             <s-goods-item
               :title="item.goods.title"
               :img="item.goods.image"
-              price="666"
-              skuText="123"
+              :price="item.goods.price[0]"
+              :skuText="item.goods.subtitle"
               priceColor="#FF3000"
               :titleWidth="400"
               @tap="
@@ -69,16 +68,15 @@
       <su-fixed bottom :val="0" placeholder v-show="state.editMode">
         <view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
           <view class="footer-left ss-flex ss-col-center">
-            <radio-group @change="onSelectAll">
-              <label class="check-box ss-flex ss-col-center ss-p-r-30">
-                <radio
-                  :checked="state.selectAll"
-                  color="var(--ui-BG-Main)"
-                  style="transform: scale(0.7)"
-                />
-                <view>全选</view>
-              </label>
-            </radio-group>
+            <label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
+              <radio
+                :checked="state.selectAll"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.7)"
+                @tap.stop="onSelectAll"
+              />
+              <view>全选</view>
+            </label>
           </view>
           <view class="footer-right">
             <button
@@ -140,11 +138,11 @@
       page,
     });
     if (res.error === 0) {
-        let orderList = _.concat(state.pagination.data, res.data.data);
-        state.pagination = {
-          ...res.data,
-          data: orderList,
-        };
+      let orderList = _.concat(state.pagination.data, res.data.data);
+      state.pagination = {
+        ...res.data,
+        data: orderList,
+      };
       if (state.pagination.current_page < state.pagination.last_page) {
         state.loadStatus = 'more';
       } else {
@@ -190,7 +188,7 @@
         state.editMode = false;
         state.selectedCollectList = [];
         state.selectAll = false;
-        state.pagination = pagination
+        state.pagination = pagination;
         getData();
       }
     }
diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index 116bfa7..accb5ce 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -75,31 +75,30 @@
         v-if="['accountLogin', 'smsLogin', 'smsRegister'].includes(authType)"
         class="agreement-box ss-flex ss-row-center"
       >
-      <radio-group @change="onChange" class="ss-flex ss-col-center">
-          <label class="radio ss-flex">
-            <radio
-              :checked="state.protocol"
-              color="var(--ui-BG-Main)"
-              style="transform: scale(0.8)"
-            />
-            <view class="agreement-text ss-flex ss-col-center ss-m-l-8">
-              我已阅读并遵守
-              <view
-                class="tcp-text"
-                @tap.stop="onProtocol(appInfo.user_protocol.id, appInfo.user_protocol.title)"
-              >
-                《{{ appInfo.user_protocol.title }}》
-              </view>
-              <view class="agreement-text">与</view>
-              <view
-                class="tcp-text"
-                @tap.stop="onProtocol(appInfo.privacy_protocol.id, appInfo.privacy_protocol.title)"
-              >
-                《{{ appInfo.privacy_protocol.title }}》
-              </view>
+        <label class="radio ss-flex ss-col-center" @tap="onChange">
+          <radio
+            :checked="state.protocol"
+            color="var(--ui-BG-Main)"
+            style="transform: scale(0.8)"
+            @tap.stop="onChange"
+          />
+          <view class="agreement-text ss-flex ss-col-center ss-m-l-8">
+            我已阅读并遵守
+            <view
+              class="tcp-text"
+              @tap.stop="onProtocol(appInfo.user_protocol.id, appInfo.user_protocol.title)"
+            >
+              《{{ appInfo.user_protocol.title }}》
             </view>
-          </label>
-        </radio-group>
+            <view class="agreement-text">与</view>
+            <view
+              class="tcp-text"
+              @tap.stop="onProtocol(appInfo.privacy_protocol.id, appInfo.privacy_protocol.title)"
+            >
+              《{{ appInfo.privacy_protocol.title }}》
+            </view>
+          </view>
+        </label>
       </view>
       <view class="safe-box"></view>
     </view>
diff --git a/sheep/components/s-coupon-select/s-coupon-select.vue b/sheep/components/s-coupon-select/s-coupon-select.vue
index 489e925..928f903 100644
--- a/sheep/components/s-coupon-select/s-coupon-select.vue
+++ b/sheep/components/s-coupon-select/s-coupon-select.vue
@@ -19,15 +19,14 @@
         <view v-for="(item, index) in state.couponInfo.can_use" :key="index">
           <s-coupon-list :data="item" type="user" :disabled="false">
             <template #default>
-              <radio-group @change="radioChange(item.id)" class="ss-flex ss-col-center">
-                <label class="radio">
-                  <radio
-                    color="var(--ui-BG-Main)"
-                    style="transform: scale(0.8)"
-                    :checked="state.couponId == item.id"
-                  />
-                </label>
-              </radio-group>
+              <label class="ss-flex ss-col-center" @tap="radioChange(item.id)">
+                <radio
+                  color="var(--ui-BG-Main)"
+                  style="transform: scale(0.8)"
+                  :checked="state.couponId == item.id"
+                  @tap.stop="radioChange(item.id)"
+                />
+              </label>
             </template>
           </s-coupon-list>
         </view>
diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
index a470f27..8a60f72 100644
--- a/sheep/components/s-wallet-card/s-wallet-card.vue
+++ b/sheep/components/s-wallet-card/s-wallet-card.vue
@@ -100,9 +100,9 @@
         }
 
         .unit-text {
-          font-size: 16rpx;
-          color: #000000;
-          line-height: 16rpx;
+          font-size: 24rpx;
+          color: #343434;
+          line-height: 24rpx;
         }
       }
     }