Merge branch 'main' of http://git.gpxscs.cn/front/java-mall-app

community/community/detail.vue

@@ -2122,7 +2122,7 @@ input {
   width: 100%;
   height: 87rpx;
   position: fixed;
-  bottom: 10rpx;
+  bottom: 35rpx;
   left: 0;
   background-color: #fff;
   z-index: 1;

components/store-lists.vue

@@ -1,6 +1,6 @@
 <template>
   <view>
-    <view class="m-tips" style="margin: 0rpx 0" v-if="titleText">
+    <!-- <view class="m-tips" style="margin: 0rpx 0" v-if="titleText">
       <view
         class="m-tips-str"
         :style="
@@ -9,53 +9,10 @@
         "
         >{{ titleText }}</view
       >
-    </view>
-    <view
-      class="m-tips"
-      style="margin: 0rpx 0; color: #000000"
-      v-if="titleText"
-    >
-      <!-- table切换start -->
-      <scroll-view
-        class="scroll-view_S"
-        scroll-x
-        show-scrollbar="false"
-        :style="{ backgroundColor: bgColor }"
-      >
-        <view class="scroll-view-item_S">
-          <label
-            :class="['m-navbar-item', tapindex == -1 ? 'm-navbar-item-on' : '']"
-            style="padding: 0"
-            :data-index="-1"
-            :data-id="0"
-            @click="setTab"
-            >{{ __("推荐") }}</label
-          >
-        </view>
-        <view
-          class="scroll-view-item_S"
-          v-for="(items, index) in store_category_lists"
-          :key="index"
-        >
-          <label
-            :class="[
-              'm-navbar-item',
-              tapindex == index ? 'm-navbar-item-on' : '',
-            ]"
-            style="padding: 0"
-            :data-index="index"
-            :data-id="items.store_category_id"
-            @click="setTab"
-            >{{ items.store_category_name }}</label
-          >
-        </view>
-      </scroll-view>
-      <!-- table切换end -->
-      <!-- 全部订单start -->
-    </view>
+    </view> -->
     <view v-if="loadComplete">
       <block v-if="true">
-        <view class="flex-container">
+<!--        <view class="flex-container">
           <HMfilterDropdown
             :filterData="filterData"
             :defaultSelected="filterDropdownValue"
@@ -65,7 +22,7 @@
             v-if="isShowFilter"
             >></HMfilterDropdown
           >
-        </view>
+        </view> -->
         <block v-if="isdata && !issshow">
           <scroll-view
             class="order-list"

member/member/data.vue

@@ -117,7 +117,7 @@
           <view class="m-icon-warn uni-icon uni-icon-info" type="warn"></view>
         </view>
       </view>
-      <view class="m-cell m-cell-vcode hide">
+<!--      <view class="m-cell m-cell-vcode hide">
         <view class="m-cell-hd">
           <label class="u-label">{{ __("验证码") }}</label>
         </view>
@@ -131,7 +131,7 @@
           btntext
         }}</view>
         <view v-else class="m-vcode-btn">{{ btntext }}</view>
-      </view>
+      </view> -->
     </view>
     <mpvue-city-picker :themeColor="themeColor" ref="mpvueCityPicker" :pickerValueDefault="cityPickerValueDefault"
       @onCancel="onCancel" @onConfirm="onConfirm"></mpvue-city-picker>

member/order/detail.vue

@@ -2227,7 +2227,7 @@ export default {
         content: "";
         width: 50%;
         height: 100%;
-        background: #f9dd49;
+        background: #ff4f28;
       }
 
       .iconfontAili {
@@ -2263,7 +2263,7 @@ export default {
       .satisfy {
         font-weight: bold;
         color: #000;
-        background: #f7dd4a;
+        background: #ff4f28;
       }
     }
 
@@ -2273,7 +2273,7 @@ export default {
         content: "";
         width: 80%;
         height: 100%;
-        background: #f9dd49;
+        background: #ff4f28;
       }
     }
   }