ext.liuqiwen3 1 日 前
コミット
e8b1dfdd33

+ 9 - 7
components/productWindow/index.vue

@@ -353,8 +353,8 @@ function getCheckedValue() {
       line-height: 88rpx;
       color: #333;
       border-radius: 16rpx;
-      background-color: $header-color;
-      border-color: $header-color;
+      background-color: #F8C008;
+      border-color: #F8C008;
     }
   }
 
@@ -411,6 +411,7 @@ function getCheckedValue() {
     height: 54rpx;
     border: 2rpx solid #DCDFE6;
     display: inline-flex;
+    border-radius: 4rpx;
 
     view {
       width: 84rpx;
@@ -424,9 +425,10 @@ function getCheckedValue() {
 
     .reduce {
       width: 58rpx;
-      border-right: 0;
-      border-radius: 6rpx 0 0 6rpx;
+      border: 0;
+      //border-radius: 4rpx 0 0 4rpx;
       line-height: 48rpx;
+      background: #F5F7FA;
 
       &.on {
         color: #8C8C8C;
@@ -437,10 +439,10 @@ function getCheckedValue() {
 
     .plus {
       width: 58rpx;
-      border-left: 0;
-      border-radius: 0 6rpx 6rpx 0;
+      border: 0;
+      //border-radius: 0 4rpx 4rpx 0;
       line-height: 48rpx;
-
+      background: #F5F7FA;
       &.on {
         border-color: #e3e3e3;
         color: #8C8C8C;

+ 10 - 10
pages.json

@@ -101,7 +101,7 @@
 		{
 			"path": "pages/webview/index",
 			"style": {
-				"navigationBarTitleText": "H5服务",
+				"navigationBarTitleText": "服务",
 				"navigationBarBackgroundColor": "#ffe079",
 				"navigationBarTextStyle": "black"
 			}
@@ -272,14 +272,14 @@
 						}
 					}
 				},
-				{
-					"path": "vault/index",
-					"style": {
-						"navigationBarTitleText": "钱包",
-						"navigationBarBackgroundColor": "#ffe079",
-						"navigationBarTextStyle": "black"
-					}
-				},
+//				{
+//					"path": "vault/index",
+//					"style": {
+//						"navigationBarTitleText": "钱包",
+//						"navigationBarBackgroundColor": "#ffe079",
+//						"navigationBarTextStyle": "black"
+//					}
+//				},
 				{
 					"path": "user_goods_collection/index",
 					"style": {
@@ -402,7 +402,7 @@
 		"backgroundColor": "#ffe079"
 	},
 	"tabBar": {
-		"color": "#282828",
+		"color": "#999999",
 		"selectedColor": "#F8C008",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",

+ 13 - 6
pages/goods/goods_details/index.vue

@@ -63,9 +63,9 @@
 <!--                      <uni-icons size="24" type="redo"></uni-icons>-->
 <!--                    </view>-->
                   </view>
-                  <view class="label acea-row row-between-wrapper">
+                  <view class="label acea-row">
                     <view>工费:{{ attr.productSelect.price || 0 }}元/g</view>
-                    <view>重量:{{ attr.productSelect.weight }}g</view>
+<!--                    <view>重量:{{ attr.productSelect.weight }}g</view>-->
                     <view>
                       附加费:{{ attr.productSelect.additionalAmount || "" }}
                     </view>
@@ -123,10 +123,10 @@
             <view class="product-card" @click="selecAttr">
               <!-- 材质和克重行 -->
               <view class="material-row">
-                <view class="material-item" style="width: 60rpx;">
+                <view class="material-item" style="width: 50rpx;">
                   <image style="width: 40rpx;height: 40rpx;" src="@/static/images/order.png" mode="widthFix"></image>
                 </view>
-                <view class="material-item">
+                <view class="material-item" style="width: 15%;">
                   <text class="material-value">{{ metalTypeFormatter(productInfo.metalType) }}</text>
                   <text class="material-label">材质</text>
                 </view>
@@ -159,7 +159,7 @@
               <!-- 规格选择区域 -->
               <view class="spec-section">
                 <view style="width: 60rpx;text-align: center;">
-                  <image style="width: 40rpx;height: 40rpx;" src="@/static/images/2-001.png" mode="widthFix"></image>
+                  <image style="width: 32rpx;height: 32rpx;" src="@/static/images/fenlei.png"></image>
                 </view>
                   <view class="spec-info">
                   <view class="spec-label">请选择规格</view>
@@ -1952,7 +1952,7 @@ action-sheet-item {
 .material-row {
   display: flex;
   justify-content: flex-start;
-  align-items: center;
+  //align-items: center;
   padding: 24rpx 0;
 }
 
@@ -1971,6 +1971,7 @@ action-sheet-item {
   font-size: 26rpx;
   color: #999;
   margin-bottom: 8rpx;
+  margin-top: 8rpx;
 }
 
 .material-value {
@@ -2041,6 +2042,7 @@ action-sheet-item {
   color: #333;
   font-weight: 500;
   margin-bottom: 8rpx;
+  margin-left: 10rpx;
 }
 
 .spec-hint {
@@ -2098,6 +2100,11 @@ action-sheet-item {
     width: 40rpx;
   }
 }
+.label{
+  display: flex;
+  gap: 30rpx;
+  color: #666;
+}
 </style>
 <style>
 .goods-nav-bar {

+ 9 - 4
pages/index/index.vue

@@ -28,7 +28,7 @@
                 url="/pages/goods/goods_search/index"
                 class="input"
                 hover-class="none"
-            ><text class="iconfont icon-sousuo"></text> 搜索商品</navigator
+            ><image class="searchImg" src="@/static/images/search.png"></image> 搜索商品</navigator
             >
           </view>
           <!-- 轮播图 -->
@@ -1034,7 +1034,7 @@ page {
       height: 80rpx;
       background-color: #ffffff;
       border-radius: 20rpx;
-      font-size: 22rpx;
+      font-size: 28rpx;
       color: #868686;
 
       .iconfont {
@@ -1042,6 +1042,11 @@ page {
         font-size: 26rpx;
         color: #666666;
       }
+      .searchImg{
+        width: 32rpx;
+        height: 32rpx;
+        margin: 0 20rpx;
+      }
     }
   }
 
@@ -1142,10 +1147,9 @@ page {
           }
 
           .sales {
-            color: #b4b4b4;
             font-size: 22rpx;
             white-space: nowrap;
-            color: #6e6e6e;
+            color: #999999;
           }
 
         }
@@ -1265,6 +1269,7 @@ page {
     .price{
       font-size: 44rpx;
       color: #FD5B37;
+      font-weight: bold;
       .unit{
         font-size: 28rpx;
       }

ファイルの差分が大きいため隠しています
+ 8 - 8
pages/merchantCenter/index.vue


+ 4 - 1
pages/merchantCenters/components/merchant_cate.vue

@@ -12,7 +12,7 @@
       <scroll-view scroll-y="true" :scroll-into-view="toView" :style='"height:"+height+"rpx;"' @scroll="scroll"
                    scroll-with-animation='true'>
         <view v-for="(item,index) in productList" :key="index">
-          <view class='listw'>
+          <view class='listw' :id="'b'+index">
             <view class='title acea-row row-center-wrapper'>
               <view class='line'></view>
               <view class='name'>{{item.name}}</view>
@@ -174,6 +174,9 @@ defineExpose({
 </script>
 
 <style scoped lang="scss">
+.productSort{
+  padding-right: 30rpx;
+}
 .productSort .aside {
   position: absolute;
   width: 180rpx;

+ 24 - 16
pages/merchantCenters/merchant.vue

@@ -3,22 +3,25 @@
 <template>
   <view class="container">
 <!--    商家信息-->
-    <view class="store-card">
-      <view class="info-top">
-        <view class="left">
-          <image class="storeImg" :src="merchantInfo.merchantLogo" mode="aspectFit"></image>
+    <view class="padding30">
+      <view class="store-card">
+        <view class="info-top">
+          <view class="left">
+            <image class="storeImg" :src="merchantInfo.merchantLogo" mode="aspectFit"></image>
+          </view>
+          <view class="center">
+            <view class="name">{{merchantInfo.merchantName}}</view>
+          </view>
         </view>
-        <view class="center">
-          <view class="name">{{merchantInfo.merchantName}}</view>
+        <view class="desc">{{merchantInfo.merchantDescribe}}</view>
+        <view class="tel" @click="makePhoneCall">
+          <image class="phone2 mr20" src="@/static/images/phone2.png"></image>
+          <text>联系电话:{{merchantInfo.merchantPhone}}</text>
+          <image class="phone fr" src="@/static/images/phone.png"></image>
         </view>
       </view>
-      <view class="desc">{{merchantInfo.merchantDescribe}}</view>
-      <view class="tel" @click="makePhoneCall">
-        <image class="phone mr20" src="@/static/images/phone2.png" mode="widthFix"></image>
-        <text>联系电话:{{merchantInfo.merchantPhone}}</text>
-        <image class="phone fr" src="@/static/images/phone.png" mode="widthFix"></image>
-      </view>
     </view>
+
 <!--    商品-->
     <up-tabs :list="tabList"
              @click="tabChange"
@@ -37,7 +40,7 @@
               transform: 'scale(1)'
         }"></up-tabs>
       <!--    商品列表-->
-    <view class="index-product-wrapper" v-if="tabActive == '0'">
+    <view class="index-product-wrapper padding30" v-if="tabActive == '0'">
       <view
           class="list-box animated"
           :class="goodsList.length > 0 ? 'fadeIn on' : ''"
@@ -251,8 +254,8 @@ const goDetail = async (item) => {
 </script>
 <style scoped lang="scss">
 .container{
-  padding: 30rpx;
-  box-sizing: border-box;
+  //padding: 30rpx;
+  //box-sizing: border-box;
 }
 .store-card{
   background: #ffffff;
@@ -294,8 +297,13 @@ const goDetail = async (item) => {
     font-size: 28rpx;
     color:#333;
     line-height: 40rpx;
+    .phone2{
+      width: 32rpx;
+      height: 32rpx;
+    }
     .phone{
-      width: 34rpx;
+      width: 40rpx;
+      height: 40rpx;
       vertical-align: middle;
     }
   }

+ 2 - 0
pages/merchantCenters/postInformation.vue

@@ -78,6 +78,7 @@ const handleTemplatePublish = () => {
 .main-title {
   display: block;
   font-size: 36rpx;
+  font-weight: bold;
   color: #333;
   line-height: 50rpx;
   margin-bottom: 12rpx;
@@ -121,6 +122,7 @@ const handleTemplatePublish = () => {
 .option-title {
   font-size: 32rpx;
   color: #333;
+  font-weight: bold;
 }
 
 .option-description {

+ 2 - 2
pages/merchantCenters/productCenter.vue

@@ -153,7 +153,7 @@ onReachBottom(() => {
 /* 搜索栏样式 */
 .search-bar {
   background: #fff;
-  padding: 30rpx 30rpx 0;
+  padding: 20rpx;
 }
 
 .search-input {
@@ -184,7 +184,7 @@ onReachBottom(() => {
   border-bottom: 4rpx solid #333;
 }
 .product-list{
-  padding: 30rpx;
+  padding: 20rpx;
   box-sizing: border-box;
 }
 /* 商品卡片样式 */

+ 5 - 6
pages/merchantCenters/productManagement.vue

@@ -27,8 +27,7 @@
                lineHeight="2"
                :itemStyle="{
                flex:1,
-               height:'44px',
-               marginTop:'8px'
+               height:'36px',
              }"
                :activeStyle="{
                 color: '#F8C008',
@@ -495,8 +494,8 @@ onReachBottom(() => {
   position: relative;
   background-color: #fff;
   border-radius: 16rpx;
-  padding: 30rpx;
-  margin: 20rpx 30rpx;
+  padding: 20rpx;
+  margin: 10rpx 20rpx;
   box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
 }
 
@@ -579,8 +578,8 @@ onReachBottom(() => {
   justify-content: flex-start;
   align-items: center;
   gap: 20rpx;
-  padding-top: 20rpx;
-  border-top: 1rpx solid #f0f0f0;
+  padding-top: 10rpx;
+  //border-top: 1rpx solid #f0f0f0;
 }
 
 .btn {

ファイルの差分が大きいため隠しています
+ 48 - 19
pages/user/index.vue