chengziding 9 小时之前
父节点
当前提交
30bcbe667d

二进制
assets/images/online/icon_7.png


+ 3 - 3
pages/my/myTimejob/myTimejob.js

@@ -105,9 +105,9 @@ Page({
     app._post_form('work/mylistNew', '', this.data.params,
       function (res) {
         if (res.code == 0) {
-          res.data.list.map(v => {
-            v.work.tags = [{ tag: '11' }, { tag: '11' }, { tag: '11' }]
-          })
+          // res.data.list.map(v => {
+          //   v.work.tags = [{ tag: '11' }, { tag: '11' }, { tag: '11' }]
+          // })
           if (res.data.list.length > 0 && that.data.listData.length > 0 && res.data.list[0].id == that.data.listData[0].id) {
             return;
           }

+ 4 - 1
pages/my/myTimejob/myTimejob.wxml

@@ -25,7 +25,10 @@
           </view>
           <view class="btn1 cencal" data-id="{{item.workId}}" catchtap='cancel'
             wx:if="{{item.status == '02' || item.status == '01'}}">取消兼职</view>
-          <i class="iconfont1 icon-yiwancheng finish" wx:if="{{item.status == '03' || item.status == '04'}}"></i>
+          <!-- wx:if="{{item.status == '03' || item.status == '04'}}" -->
+          <!-- <i class="iconfont1 icon-yiwancheng finish"></i> -->
+          <image class="finish" wx:if="{{item.status == '03' || item.status == '04'}}"
+            src="/assets/images/online/icon_7.png" mode="widthFix"></image>
         </view>
         <view class="pricewrap">
           <view class="price">

+ 6 - 1
pages/my/myTimejob/myTimejob.wxss

@@ -284,5 +284,10 @@ color: #1a1a1a;
 }
 
 .finish {
-  font-size: 80rpx;
+  position: absolute;
+  z-index: 100;
+  color: #B3B3B3;
+  width: 85rpx;
+   bottom: 37rpx;
+  right:29rpx;
 }

+ 3 - 2
pages/quality/detail/index.wxml

@@ -12,7 +12,7 @@
     <view class="goods-title">{{detail.name}}</view>
     <view class="goods-classify">{{detail.categoryName}}</view>
     <view class="goods-total-num">剩余:{{detail.quantity}}</view>
-    <view class="goods-price">{{detail.price}}</view>
+    <view class="goods-price">价值:<text>{{detail.price}}</text></view>
   </view>
   <view class="big-box {{ user && !user.id || (user.memberState == 0 && detail.memberApply) ? 'vipBg' : ''}}">
     <view class="dim {{user && !user.id ||  (user.memberState == 0 && detail.memberApply) ? '' : 'showDim'}}">
@@ -36,7 +36,8 @@
     <button bindtap="wantTo">我想要</button>
   </view>
 
-  <popup2 id='popup2' title='查看二维码' content="{{['']}}" btn2="{{false}}" btn_no='' btn_ok='知道了' bind:error="_error" bind:success="_success" data-name="popup2">
+  <popup2 id='popup2' title='查看二维码' content="{{['']}}" btn2="{{false}}" btn_no='' btn_ok='知道了' bind:error="_error"
+    bind:success="_success" data-name="popup2">
     <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">
       <view class="code-tip">{{detail.qrCodeInfo}}</view>
       <image class="code-img" src='{{detail.qrCode}}' bindtap="seeBigCode" />

+ 18 - 11
pages/quality/detail/index.wxss

@@ -38,6 +38,7 @@ page {
   color: #1a1a1a;
   margin-bottom: 10rpx;
   word-break: break-all;
+  font-weight: 700;
 }
 
 .goods-base-info .goods-classify,
@@ -48,12 +49,16 @@ page {
 }
 
 .goods-base-info .goods-price {
+  font-size: 24rpx;
+  font-family: PingFang SC, PingFang SC-Medium;
+  color: #666666;
+}
+.goods-base-info .goods-price text{
   font-size: 32rpx;
   font-family: PingFang SC, PingFang SC-Medium;
-  font-weight: 500;
+  font-weight: 700;
   color: #ec2e26;
 }
-
 .big-box {
   position: relative;
   padding-bottom: 300rpx;
@@ -126,12 +131,12 @@ page {
   display: block;
   content: "";
   position: absolute;
-  top: 35%;
-  width: 6rpx;
-  height: 35rpx;
-  left: 1rpx;
-  background: #ffdd36;
-  border-radius: 3rpx;
+  top: 25%;
+  left: 96rpx;
+  width: 30rpx;
+  height: 30rpx;
+  background: rgba(0,94,255,0.26);
+  border-radius: 50%;
 }
 
 .goods-remarks {
@@ -148,16 +153,18 @@ page {
   bottom: 0;
   left: 50%;
   width: 100%;
-  padding: 30rpx 0;
+  padding: 30rpx 0rpx;
   transform: translateX(-50%);
   background-color: #fff;
 }
 
 .btn button {
-  width: 690rpx;
+  width: 630rpx;
   height: 85rpx;
   text-align: center;
   line-height: 85rpx;
-  background: #ffdc2f;
+  background: #2B58A5;
   border-radius: 43rpx;
+  color: #ffffff;
+  font-size: 30rpx;
 }

+ 7 - 3
pages/quality/index/index.wxml

@@ -2,7 +2,8 @@
 <view class="container-goods">
   <view class="tabs">
     <scroll-view class="scroll-view" scroll-x scroll-into-view="{{scrollIntoView}}" scroll-with-animation>
-      <view data-index="{{index}}" id="location{{item.id}}" class="tab {{index == currentTab ? 'tab-active' : ''}}" wx:for="{{tabs}}" wx:key="item" bindtap="handleClassfiy">{{item.name}}</view>
+      <view data-index="{{index}}" id="location{{item.id}}" class="tab {{index == currentTab ? 'tab-active' : ''}}"
+        wx:for="{{tabs}}" wx:key="item" bindtap="handleClassfiy">{{item.name}}</view>
     </scroll-view>
   </view>
   <view class="goods">
@@ -14,8 +15,11 @@
           <!-- <text>{{item.name}}</text> -->
         </view>
         <view class="goods-classify">{{item.categoryName}}</view>
-        <view class="goods-total-num">剩余:{{item.quantity}}</view>
-        <view class="getCoupon">点击领券</view>
+        <view class="goods-total-num">剩余:<text>{{item.quantity}}</text></view>
+        <view class="getCouponBox">
+          <view class="getCoupon">我想要</view>
+        </view>
+
         <!-- <view class="goods-price">{{item.price}}</view> -->
       </view>
     </view>

+ 36 - 22
pages/quality/index/index.wxss

@@ -18,7 +18,7 @@ page {
   width: 100%;
   height: 100rpx;
   background-color: #fff;
-  border-bottom: 1rpx solid #e6e6e6;
+  /* border-bottom: 1rpx solid #e6e6e6; */
   z-index: 3;
 }
 
@@ -37,12 +37,14 @@ page {
 .tabs .scroll-view .tab {
   display: inline-block;
   margin-right: 72rpx;
+  font-size: 32rpx;
+  color: #1A1A1A;
 }
 
 .tabs .scroll-view .tab-active {
   position: relative;
-  color: #1a1a1a;
-  font-size: 32rpx;
+  color: #2B58A5;
+  font-size: 34rpx;
 }
 
 .tabs .scroll-view .tab-active::after {
@@ -53,7 +55,7 @@ page {
   content: "";
   width: 100%;
   height: 4rpx;
-  background-color: #ffdd36;
+  background-color: #2B58A5;
   border-radius: 2rpx;
   z-index: 9;
 }
@@ -69,33 +71,37 @@ page {
 }
 
 .goods .goods-item image {
-  width: 240rpx;
-  height: 240rpx;
-  border-radius: 20rpx;
-  margin-right: 28rpx;
+  width: 210rpx;
+  height: 210rpx;
+  border-radius: 10rpx;
+  margin-right: 30rpx;
   flex-shrink: 0;
 }
 
 .goods .goods-item .body {
   font-weight: 400;
   font-family: FZZhunYuan-M02S, FZZhunYuan-M02S-Regular;
+  flex: 1;
+}
+.getCouponBox{
+  width: 100%;
+  text-align: right;
 }
-
 .goods .goods-item .body .goods-title {
   /* display: flex;
   align-items: center; */
   padding-top: 8rpx;
-  height: 80rpx;
-  font-size: 28rpx;
+  /* height: 80rpx; */
+  font-size: 30rpx;
   /* color: #1a1a1a; */
-  color: #333333;
+  color: #1A1A1A;
   font-weight: 700;
-  margin-bottom: 20rpx;
+  margin-bottom: 16rpx;
   word-break: break-all;
   overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
-  -webkit-line-clamp: 2; /* 设置行数 */
+  -webkit-line-clamp: 1; /* 设置行数 */
   -webkit-box-orient: vertical;
 }
 
@@ -108,18 +114,25 @@ page {
   -webkit-line-clamp: 2; /* 设置行数 */
   -webkit-box-orient: vertical;
 }
-
+.goods-classify{
+  background: #f0f1f5;
+  border-radius: 10rpx;
+  width: fit-content;
+  padding: 6rpx 14rpx;
+}
 .goods .goods-item .body .goods-classify,
 .goods .goods-item .body .goods-total-num {
-  font-size: 24rpx;
+  font-size: 22rpx;
   color: #808080;
-  margin-bottom: 20rpx;
+  margin-bottom: 16rpx;
 }
 
 .goods .goods-item .body .goods-total-num {
   margin-bottom: 6rpx;
 }
-
+.goods-total-num text{
+  color: #FF9209;
+}
 .goods .goods-item .body .goods-price {
   font-size: 32rpx;
   font-family: PingFang SC, PingFang SC-Medium;
@@ -129,10 +142,11 @@ page {
 
 .goods .goods-item .body .getCoupon {
   display: inline-block;
-  background-color: #ffdc2f;
-  padding: 10rpx 40rpx;
-  border-radius: 20rpx;
-  font-size: 28rpx;
+  background-color: #2B58A5;
+  padding: 15rpx 34rpx;
+  border-radius: 30rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
 }
 
 /* .goods .goods-item .body .goods-price text {

+ 9 - 2
project.private.config.json

@@ -2,12 +2,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/quality/index/index",
+          "pathName": "pages/quality/index/index",
+          "query": "id=10",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "pages/my/myTimejob/myTimejob",
           "pathName": "pages/my/myTimejob/myTimejob",
           "query": "",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "pages/my/myPlay/myPlay",