chengjunhui месяцев назад: 5
Родитель
Сommit
a4f02c7c66

+ 2 - 0
app.js

@@ -9,6 +9,8 @@ App({
    */
   // apiRoot: "https://qingyunhui.songlanyun.com/qyh/api/", // 正式环境api地址
   apiRoot: 'http://192.168.0.181:8687/qyh/api/',
+  // apiRoot: 'http://192.168.0.193:8687/qyh/api/',
+
   // apiRoot: 'http://192.168.0.193:8687/qyh/api/',
   // apiRoot: 'http://192.168.0.232:8687/wjxy/api/', //黄理志
   // apiRoot: 'http://192.168.0.186:8687/wjxy/api/',

BIN
assets/images/tabbar/tab2.png


BIN
assets/images/tabbar/tab22.png


BIN
assets/images/tabbar/tab3.png


BIN
assets/images/tabbar/tab33.png


BIN
assets/images/tabbar/tab4.png


BIN
assets/images/tabbar/tab44.png


+ 5 - 0
expert/detail/detail.wxss

@@ -229,6 +229,9 @@ page {
   font-weight: 400;
   color: #999999;
   margin-top: 15rpx;
+  word-wrap: break-word; /* 旧标准,等同于 overflow-wrap */
+  overflow-wrap: break-word; /* 新标准 */
+
 }
 .share-box {
   width: 690rpx;
@@ -284,6 +287,8 @@ page {
   font-weight: 400;
   color: #666666;
   margin-top: 20rpx;
+  word-wrap: break-word; /* 旧标准,等同于 overflow-wrap */
+  overflow-wrap: break-word; /* 新标准 */
 }
 .share-box .label-box {
   display: flex;

+ 1 - 1
job/postJob/detail.wxml

@@ -91,7 +91,7 @@
 
       </view>
       <view class="warning-box">
-        <image mode="aspectFill" src="/assets/wujie/warning.png" class="warning-img" />
+        <image mode="aspectFill" src="{{appAssetsUrl2}}wjxy/warning.png" class="warning-img" />
         <view style="margin-left: 13rpx;">报名前确认可以完成此项工作,随意取消工作系统将自 动冻结报名操作</view>
       </view>
     </view>

+ 2 - 2
job/postJob/detail.wxss

@@ -1016,7 +1016,7 @@ page {
 .warning-box {
   width: 690rpx;
   height: 101rpx;
-  background: #fffae1;
+  background: #d8e0ee;
   border-radius: 0px 0px 16rpx 16rpx;
   display: flex;
   justify-content: space-between;
@@ -1026,7 +1026,7 @@ page {
   font-size: 24rpx;
   font-family: FZZhunYuan-M02S;
   font-weight: 400;
-  color: #ffa836;
+  color: #1a56a6;
 }
 
 .warning-img {

+ 1 - 1
pages/checkin/index.wxml

@@ -6,7 +6,7 @@
       <view class="user-details">
         <view class="nickname">
           <text >{{userInfo.vipname}}</text>
-          <image class="vip-icon" src="{{appAssetsUrl2}}wjxy/mine/vip-icon.png"></image>
+          <image class="vip-icon" src="{{appAssetsUrl3}}user-icon/vip-icon3.png"></image>
         </view>
       </view>
     </view>

+ 2 - 0
pages/checkin/index.wxss

@@ -311,6 +311,8 @@
 
 .task-action.complete {
   background: #999999;
+  box-shadow: none;
+
 }
 
 .task-action.complete .action-text {

+ 1 - 1
pages/dashen/index.wxml

@@ -14,7 +14,7 @@
       </scroll-view>
     </view>
   </view>
-  <view class="content" style="margin-top:48px;">
+  <view class="content" style="margin-top:38px;">
     <scroll-view scroll-y>
       <view class='hang-item' wx:if="{{listData.length>0}}" data-id="{{item.id}}" wx:for="{{listData}}" wx:key="{{item.id}}" bindtap="toPartDetail">
         <image src="{{item.expertPhoto}}" mode="aspectFill" class='per-img'></image>

+ 3 - 3
pages/dashen/index.wxss

@@ -15,7 +15,7 @@ page {
 }
 .sticky-box {
   /* border-bottom:1px solid #e6e6e6; */
-  height: 48px;
+  height: 38px;
   padding: 0 32rpx;
   background-color: white;
   width: 750rpx;
@@ -24,7 +24,7 @@ page {
 .content {
   flex: 1;
   background: #f7f8fa;
-  padding: 40rpx 30rpx;
+  padding: 30rpx;
   border-radius: 40rpx 40rpx 0 0;
 }
 .top-act {
@@ -61,7 +61,7 @@ page {
   color: #666666;
   margin-right: 44rpx;
   position: relative;
-  height: 48px;
+  height: 38px;
   /* line-height: 103rpx; */
   font-family: PingFang SC, PingFang SC-Regular;
   font-weight: 400;

+ 1 - 1
pages/experience/index/index.js

@@ -180,7 +180,7 @@ Page({
             (ButtonBounding.top - res.statusBarHeight) * 2 +
             "px",
           titleHeight: res.statusBarHeight + "px",
-          conTop: 50 + "px",
+          conTop: 40 + "px",
           shaiHeight: navHeight + 48 + "px",
           staHeight: res.statusBarHeight,
         });

+ 4 - 3
pages/experience/index/index.wxss

@@ -17,7 +17,7 @@ page {
 .sticky-box {
   /* border-bottom: 1px solid #e6e6e6; */
   /* height: 103rpx; */
-  height: 48px;
+  height: 38px;
   padding: 0 32rpx;
   background-color: white;
   width: 750rpx;
@@ -45,7 +45,7 @@ page {
   margin-right: 43rpx;
   position: relative;
   /* height: 103rpx; */
-  height: 48px;
+  height: 38px;
   /* line-height: 103rpx; */
   /* line-height: 57px; */
   padding-top: 15rpx;
@@ -630,6 +630,7 @@ page {
   background-color: white;
   justify-content: flex-start;
   padding: 20rpx 0;
+  box-sizing: border-box;
 }
 .picker text {
   font-family: PingFang-SC-Regular;
@@ -651,7 +652,7 @@ page {
 }
 .pageContentfix .section {
   /* height: 90rpx; */
-  height: 50px;
+  height: 60rpx;
   width: fit-content;
   display: flex;
   flex-direction: row;

+ 15 - 8
pages/home/index/index.js

@@ -113,9 +113,12 @@ Page({
       e.currentTarget.dataset.index == 3
     ) {
       if (wx.getStorageSync("USER")) {
+        const obj = this.data.goodsClassfiyList.find(v => v.name == '联名福利') || '';
+        // console.log(obj);
+        wx.setStorageSync('classfiyId', obj ? obj.id : '')
         wx.navigateTo({
           url: e.currentTarget.dataset.index == 4 ?
-            "/invitationCode/index" : "/pages/quality/index/index?id=" + this.data.goodsClassfiyList[1].id,
+            "/invitationCode/index" : `/pages/quality/index/index`,
         });
       } else {
         wx.navigateTo({
@@ -658,7 +661,7 @@ Page({
     // 胶囊高度 32px 下边框6px height 状态栏高度
     this.setData({
       statusBarHeightTop: statusBarHeightTop + "px",
-      statusBarHeight: height + "px",
+      statusBarHeight: height - 12 + "px",
       statusBarMH: mH + "px",
     });
   },
@@ -704,16 +707,17 @@ Page({
   getGoodsClassfiy() {
     app._get("goodscategory/select", {}, (res) => {
       if (res.code == 0) {
-        const arr = res.list.splice(0, 2);
+        // const arr = res.list.splice(0, 2);
         this.setData({
-          goodsClassfiyList: arr,
+          goodsClassfiyList: res.list,
         });
         if (this.data.goodsClassfiyList[0]) {
           // this.getGoodsList0(this.data.goodsClassfiyList[0].id);
         }
-        if (this.data.goodsClassfiyList[1]) {
-          this.getGoodsList1(this.data.goodsClassfiyList[1].id);
-        }
+        const obj = res.list.find(v => v.name == '联名福利') || '';
+        console.log(obj);
+        if(!obj) return
+        this.getGoodsList1(obj.id);
       }
     });
   },
@@ -753,7 +757,10 @@ Page({
   },
 
   toGoodsList(e) {
-    wx.setStorageSync('classfiyId', e.currentTarget.dataset.id)
+    let name = e.currentTarget.dataset.name;
+    const obj = this.data.goodsClassfiyList.find(v => v.name == name) || '';
+    // console.log(obj);
+    wx.setStorageSync('classfiyId', obj ? obj.id : '')
     wx.navigateTo({
       url: `/pages/quality/index/index`,
     });

+ 11 - 15
pages/home/index/index.wxml

@@ -117,17 +117,14 @@
             <view id="hot-right" class="txt-con">
               <view class="name">{{item.title}}</view>
               <view class="time-box">
-                <view class="icon-box">
-                  <image src="{{appAssetsUrl2}}new/shijian.png" mode="widthFix"></image>
-                  <!-- <i class="iconfont1 icon-rili icon-home-time"></i> -->
-                </view>
+                <!--<view class="icon-box"></view>-->
+                <image class="per-icon per-icon-bottom" src="{{appAssetsUrl3}}online/icon_1.png" mode="widthFix"></image>
                 <span>{{item.startTime}}-{{item.endTime}}</span>
               </view>
               <view class="address-h-box">
                 <view class="address">
-                  <view class="icon-box">
-                    <image src="{{appAssetsUrl2}}new/dizhi.png" mode="widthFix"></image>
-                  </view>
+                  <!--<view class="icon-box"></view>-->
+                  <image class="per-icon" src="{{appAssetsUrl3}}online/icon_2.png" mode=""></image>
                   <view class="address-word">{{item.address}}</view>
                 </view>
                 <view class="price-h">
@@ -137,10 +134,8 @@
               </view>
               <view class="ming-box">
                 <view class="per-box" wx:if="{{item.willnum}}">
-                  <view class="icon-box">
-                    <image src="{{appAssetsUrl2}}new/renshu.png" mode="widthFix"></image>
-                    <!-- <i class="iconfont1 icon-quanxiaozongrenshu icon-home-pel"></i> -->
-                  </view>
+                  <!-- <view class="icon-box"></view> -->
+                  <image class="per-icon  per-icon-bottom" src="{{appAssetsUrl3}}online/icon_3.png" mode="widthFix"></image>
                   <span>名额: {{item.willnum}} 人</span>
                 </view>
                 <view class="vip-txt" wx:if="{{item.isNeedVip == 1}}">VIP会员免费</view>
@@ -182,7 +177,7 @@
         <view class="address-bao">
           <view class="job-info">
             <view class="address">
-              <image src="{{appAssetsUrl2}}new/dizhi.png" mode="widthFix" class="address-icon"></image>
+              <image src="{{appAssetsUrl3}}online/icon_2.png" mode="widthFix" class="address-icon"></image>
               <!-- <i class="iconfont1 icon-dizhi icon-home-dizhi icon-address"></i> -->
               <!-- item.address -->
               <view class="address-word">{{item.address}}</view>
@@ -219,9 +214,10 @@
     <view class="classfiy-box" wx:if="{{goodsList1.length}}">
       <view class="hot-title" style="margin-top:30rpx;">
         <view class="title">
-          <view class="label">{{goodsClassfiyList[1].name}}</view>
+          <!--<view class="label">{{goodsClassfiyList[1].name}}</view>-->
+          <view class="label">联名福利</view>
         </view>
-        <view class="mword" data-id="{{goodsClassfiyList[1].id}}" bindtap="toGoodsList">
+        <view class="mword" data-id="{{goodsClassfiyList[1].id}}"  data-name="联名福利" bindtap="toGoodsList">
           <span style="margin-right:20rpx;">查看更多</span>
           <i class="iconfont icon-jiantou righticon hoticon"></i>
         </view>
@@ -341,7 +337,7 @@
           <view class="shop-info">
             <view class="shops-name">{{item.name}}</view>
             <view class="shops-address">
-              <image class="address-icon" src="{{appAssetsUrl2}}new/dizhi.png" mode="widthFix"></image>
+              <image class="address-icon" src="{{appAssetsUrl3}}online/icon_2.png" mode="widthFix"></image>
               <view class="address-text">{{item.address}}</view>
             </view>
             <view class="shop-juli">

+ 51 - 23
pages/home/index/index.wxss

@@ -90,21 +90,23 @@
 .bottom-type {
   width: 100%;
   display: flex;
-  justify-content: space-around;
-  padding: 40rpx 30rpx 30rpx;
+  justify-content: space-between;
+  padding: 30rpx 50rpx;
   box-sizing: border-box;
   /* background-color: #fff; */
 }
 
 .bottom-type .box {
+  /* min-width: 112px; */
   position: relative;
-  text-align: center;
+  /* text-align: center;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  align-items: center;
+  align-items: center; */
   /* width: 112rpx; */
   font-size: 24rpx;
+  text-align: center;
 }
 
 .bot-box0 {
@@ -132,8 +134,8 @@
 	width: 88rpx;
 } */
 .type-img {
-  width: 135rpx;
-  height: 135rpx;
+  width: 100rpx;
+  height: 91rpx;
 }
 .type-img0 {
   width: 64rpx;
@@ -168,8 +170,9 @@
   font-family: "FZZhunYuan-M02S";
   margin-top: 13rpx;
   color: #333333;
-  position: absolute;
-  bottom: -16rpx;
+  /* position: absolute; */
+  /* bottom: -16rpx; */
+  margin-top: -24rpx;
 }
 
 .hot-title {
@@ -179,7 +182,7 @@
   align-items: center;
   /* margin-top: 25rpx; */
   margin-bottom: 24rpx;
-  padding-right: 30rpx;
+  /* padding-right: 30rpx; */
   height: 41rpx;
   font-size: 36rpx;
   /* font-family: "FZZhunYuan-M02S"; */
@@ -188,6 +191,9 @@
   color: #333333;
   position: relative;
 }
+.hot-wap-box .hot-title{
+  padding-right: 30rpx;
+}
 
 .hot-title .title {
   position: relative;
@@ -239,7 +245,7 @@
 .hoticon {
   position: absolute;
   right: -12rpx;
-  top: -5rpx;
+  top: -8rpx;
 }
 
 .diy-top {
@@ -357,8 +363,8 @@
 .index-wrap-box {
   /* width: 720rpx; */
   /* margin-left: -30rpx; */
-  margin-top: 20rpx;
-  padding: 0 30rpx 30rpx;
+  margin-top: 5rpx;
+  padding: 0 30rpx 0 30rpx;
   /* background: linear-gradient(90deg,#8fcd4d, #afde7c); */
   /* background-color: white; */
 }
@@ -1442,7 +1448,7 @@
   /* width: 550rpx; */
   width: 210rpx;
   height: 210rpx;
-  border-radius: 20rpx;
+  border-radius: 10rpx;
   flex-shrink: 0;
   font-size: 0;
 }
@@ -1492,11 +1498,27 @@
   flex-shrink: 0;
 }
 
-.hot-item .icon-box image {
+.hot-item .per-icon{
+  width: 26rpx;
+  max-height: 30rpx;
+  margin-right: 10rpx;
+}
+
+.hot-item .per-icon-bottom{
+  margin-top: 0;
+}
+
+/* .hot-item .icon-box image {
   width: 100%;
   height: 100%;
 }
 
+.address-h-box .address .icon-box image {
+  width: 23rpx;
+  height: 23rpx;
+  margin-bottom: 6rpx;
+} */
+
 .icon-home-time {
   font-size: 30rpx;
   color: #ffdc2f;
@@ -1566,7 +1588,7 @@
   /* flex-shrink: 0; */
   overflow: hidden;
   display: -webkit-box;
-  -webkit-line-clamp: 2;
+  -webkit-line-clamp: 1;
   /* 设置最大显示行数 */
   -webkit-box-orient: vertical;
   text-overflow: ellipsis;
@@ -1659,7 +1681,7 @@
 }
 
 .address-bao .address image {
-  width: 21rpx;
+  width: 23rpx;
   height: 23rpx !important;
   vertical-align: middle;
 }
@@ -2391,7 +2413,7 @@
 .classfiy-box .main .goods-item {
   display: flex;
   /* align-items: center; */
-  padding: 30rpx;
+  padding: 30rpx 23rpx;
   font-size: 28rpx;
   color: #3b403d;
   font-weight: 400;
@@ -2405,7 +2427,7 @@
   height: 210rpx;
   margin-right: 30rpx;
   /* background: #000; */
-  border-radius: 20rpx;
+  border-radius: 10rpx;
   flex-shrink: 0;
 }
 
@@ -2441,8 +2463,8 @@
 .classfiy-box .main .goods-item .goods-btn .btn {
   display: inline-block;
   width: 165rpx;
-  height: 60rrpx;
-  line-height: 56rpx;
+  height: 60rpx;
+  line-height: 60rpx;
   text-align: center;
   font-size: 24rpx;
   color: #ffffff;
@@ -2502,17 +2524,20 @@
   font-size: 24rpx;
   color: #999999;
   margin-bottom: 20rpx;
+  display: flex;
+  align-items: flex-start;
 }
 
 .shop-list-box .shop-item-box .shops-address .address-icon {
-  width: 21rpx;
-  height: 23rpx !important;
+  width: 13px;
+  height: 13px !important;
   margin-right: 10rpx;
-  margin-top: 6rpx;
+  /* margin-top: 6rpx; */
   flex-shrink: 0;
 }
 
 .shop-list-box .shop-item-box .shops-address .address-text {
+  flex: 1;
   overflow: hidden;
   -webkit-line-clamp: 2;
   text-overflow: ellipsis;
@@ -2520,6 +2545,8 @@
   -webkit-box-orient: vertical;
   color: #999999;
   font-size: 24rpx;
+  /* border: 1rpx solid #000; */
+  line-height: 14px;
 }
 
 .shop-list-box .shop-item-box .shop-info .shop-juli {
@@ -2530,6 +2557,7 @@
   font-size: 24rpx;
   color: #77603d;
   background-color: #e8f1ff;
+  border-radius: 10rpx;
 }
 
 .shop-list-box .shop-item-box .shop-info .shop-juli {

+ 4 - 0
pages/home/index/partDetail/partDetail.wxss

@@ -1177,4 +1177,8 @@ page {
   border-radius: 35rpx;
   color: #ffffff;
   margin-top: 20rpx;
+}
+
+.left-t-r .icon-shoucang{
+  color: #999999;
 }

+ 1 - 1
pages/login.wxml

@@ -74,7 +74,7 @@
             <text class="txt">邀请码</text>
           </div>
           <view class="box-right">
-            <input maxlength="30" placeholder="请填写邀请码" value="{{invitecode}}" bindinput="inviteCodeInput"/>
+            <input maxlength="30" placeholder="请填写邀请码(非必填)" value="{{invitecode}}" bindinput="inviteCodeInput"/>
           </view>
         </view>
       </view>

+ 2 - 2
pages/my/index/index.wxml

@@ -23,7 +23,7 @@
                     <view class="user-details" wx:if="{{isLogin}}">
                         <view class="user-name-row" bindtap="onAvatarTap">
                             <text class="user-name">{{userInfo.vipname || '--'}}</text>
-                            <image class="vip-icon" wx:if="{{userInfo.memberState != 0 &&  userInfo.memberState}}" src="{{appAssetsUrl2}}wjxy/mine/vip-icon.png"></image>
+                            <image class="vip-icon" wx:if="{{userInfo.memberState != 0 &&  userInfo.memberState}}" src="{{appAssetsUrl3}}user-icon/vip-icon3.png"></image>
                             <image wx:if="{{userInfo.sex}}" mode="aspectFill" src="{{ userInfo.sex == '010' ? appAssetsUrl2+'wjxy/man.png' : appAssetsUrl2+'wjxy/wumen.png'}}" class="sex" />
                         </view>
                         <view class="user-id-row">
@@ -37,7 +37,7 @@
                     <view wx:if="{{!isLogin}}">点击登录</view>
                     <view class="qr-code-section" bindtap="onQRCodeTap" wx:if="{{isLogin}}">
                         <!-- <image src="{{appAssetsUrl2}}my/qrcode-icon.png" class="qr-icon"></image> -->
-                        <image src='{{appAssetsUrl3}}user-icon/inviteCode.png' class="qr-icon"></image>
+                        <image src='{{appAssetsUrl3}}user-icon/inviteCode1.png' class="qr-icon"></image>
                         <view class="qr-text">会员码</view>
                     </view>
                 </view>

+ 13 - 8
pages/my/index/index.wxss

@@ -103,6 +103,7 @@
 }
 
 .avatar-section {
+  flex-shrink: 0;
   margin-right: 24rpx;
 }
 
@@ -190,15 +191,18 @@
 }
 
 .qr-code-section {
-  padding: 16rpx;
+  flex-shrink: 0;
+  padding: 0 0 0 16rpx;
+  margin-right: 57rpx;
   text-align: center;
 }
 
 .qr-icon {
   width: 57rpx;
   height: 57rpx;
-  margin-bottom: 10rpx;
-  background: #ecf6ff;
+  /* margin-bottom: 5rpx; */
+  /* background: #ecf6ff; */
+  /* border-radius: 10rpx; */
 }
 
 .qr-text {
@@ -284,8 +288,8 @@
 }
 
 .points-icon {
-  width: 96rpx;
-  height: 96rpx;
+  width: 48px;
+  height: 48px;
   margin-right: 15rpx;
 }
 
@@ -309,7 +313,8 @@
 .points-right {
   display: flex;
   align-items: center;
-  width: 188rpx;
+  /* width: 188rpx; */
+  padding: 0 30rpx 0 42rpx;
   height: 61rpx;
   background: #ffffff;
   border: 1rpx solid #5790f7;
@@ -403,8 +408,8 @@
 }
 
 .menu-icon {
-  width: 44rpx;
-  height: 44rpx;
+  width: 39rpx;
+  height: 39rpx;
   margin-right: 20rpx;
 }
 

+ 1 - 1
pages/practicalExperience/practicalExperience.js

@@ -151,7 +151,7 @@ Page({
 					statusBarHeight: ButtonBounding.height + res.statusBarHeight + (
 						ButtonBounding.top - res.statusBarHeight) * 2 + 'px',
 					titleHeight: (height - res.statusBarHeight) + 'px',
-					conTop: 50 + 'px',
+					conTop: 40 + 'px',
 					shaiHeight: (navHeight + 48) + 'px',
 					staHeight: res.statusBarHeight,
 				})

+ 4 - 5
pages/practicalExperience/practicalExperience.wxml

@@ -51,9 +51,8 @@
 				bindtap="toPartDetail">
 				<view class="img-sex">
 					<!-- {{appAssetsUrl2}}wjxy/mine/vip-icon.png /images/wjxy/boy.png -->
-					<image
-						src="{{ item.sexlimit == '01' ? appAssetsUrl2 + 'wjxy/boy.png' : item.sexlimit == '02' ? appAssetsUrl2+'wjxy/girl.png' : appAssetsUrl2+'wjxy/boy_girl.png' }}"
-						class="{{ item.sexlimit == '01' ? 'per-img1' : item.sexlimit == '02' ? 'per-img2' : 'per-img3' }}"></image>
+					<!--<image src="{{ item.sexlimit == '01' ? appAssetsUrl2 + 'wjxy/boy.png' : item.sexlimit == '02' ? appAssetsUrl2+'wjxy/girl.png' : appAssetsUrl2+'wjxy/boy_girl.png' }}" class="{{ item.sexlimit == '01' ? 'per-img1' : item.sexlimit == '02' ? 'per-img2' : 'per-img3' }}"></image>-->
+					<image src="{{ item.sexlimit == '01' ? appAssetsUrl3 + 'online/boy.png' : item.sexlimit == '02' ?  appAssetsUrl3+'online/girl.png' :  appAssetsUrl3+'online/boy_girl.png' }}" class="{{'per-img3'}}"></image>
 				</view>
 				<view class="right-box">
 					<view class="catetop">
@@ -72,13 +71,13 @@
 									src="{{appAssetsUrl3}}online/icon_1.png"></image>
 								<view class="time-box">时间:{{item.workdateStart + '-' + item.workdateEnd}}</view>
 							</view>
-							<view style="margin-top:10rpx;">
+							<view style="margin-top:6rpx;">
 								<!-- <i class="iconfont1 icon-dizhi icon-home-dizhi"></i> -->
 								<image class="iconImg" mode="widthFix" style="width: 30rpx;" src="{{appAssetsUrl3}}online/icon_2.png">
 								</image>
 								<view class="address">地点:{{item.address}}</view>
 							</view>
-							<view style="margin-top:10rpx;">
+							<view style="margin-top:3rpx;">
 								<!-- <i class="iconfont1 icon-dizhi"></i> -->
 								<image class="iconImg" mode="widthFix" style="position: relative;top: -2rpx;margin-right: 2rpx;"
 									src="{{appAssetsUrl3}}online/icon_3.png"></image>

+ 9 - 6
pages/practicalExperience/practicalExperience.wxss

@@ -26,7 +26,7 @@ page {
 .sticky-box {
   /* border-bottom: 1px solid #e6e6e6; */
   /* height: 103rpx; */
-  height: 48px;
+  height: 38px;
   padding: 0 32rpx;
   background-color: white;
   box-sizing: border-box;
@@ -61,7 +61,7 @@ page {
   display: flex;
   flex-direction: row;
   justify-content: flex-start;
-  padding: 40rpx 30rpx 30rpx;
+  padding: 20rpx 30rpx;
   /* position: fixed;
   z-index: 99; */
   background-color: #f7f8fa;
@@ -113,7 +113,7 @@ page {
   position: relative;
   /* height: 103rpx;
 	line-height: 103rpx; */
-  height: 48px;
+  height: 38px;
   padding-top: 15rpx;
   /* line-height: 57px; */
   font-family: PingFang SC, PingFang SC-Regular;
@@ -196,7 +196,8 @@ page {
 }
 
 .img-sex {
-  width: 192rpx;
+  flex-shrink: 0;
+  /* width: 192rpx; */
   display: flex;
   /* align-items: center; */
   /* justify-content: center; */
@@ -222,8 +223,8 @@ page {
   width: 125rpx;
   height: 126rpx;
   flex-shrink: 0;
-  margin-right: 50rpx;
-  margin-left: 17rpx;
+  margin-right: 30rpx;
+  /* margin-left: 17rpx; */
 }
 
 .categoryitem .label {
@@ -377,6 +378,7 @@ page {
 }
 
 .bot-time {
+  min-width: 30rpx;
   display: flex;
   margin-top: 15rpx;
 }
@@ -584,5 +586,6 @@ page {
 
 .iconImg{
   width: 26rpx;
+  max-height: 30rpx;
   vertical-align: middle;
 }

+ 8 - 4
pages/quality/index/index.wxss

@@ -8,7 +8,7 @@ page {
 .container-goods {
   width: 100%;
   height: 100%;
-  padding-top: 100rpx;
+  padding-top: 74rpx;
 }
 
 .tabs {
@@ -16,7 +16,7 @@ page {
   top: 0;
   left: 0;
   width: 100%;
-  height: 100rpx;
+  height: 74rpx;
   background-color: #fff;
   /* border-bottom: 1rpx solid #e6e6e6; */
   z-index: 3;
@@ -26,7 +26,7 @@ page {
   width: 100%;
   height: 100%;
   white-space: nowrap;
-  line-height: 100rpx;
+  line-height: 74rpx;
   padding: 0 32rpx;
   font-size: 28rpx;
   font-family: FZZhunYuan-M02S, FZZhunYuan-M02S-Regular;
@@ -61,7 +61,7 @@ page {
 }
 
 .goods {
-  padding: 30rpx;
+  padding: 0 30rpx 30rpx 30rpx;
 }
 
 .goods .goods-item {
@@ -70,6 +70,10 @@ page {
   border-bottom: 1rpx solid #e6e6e6;
 }
 
+/* .goods .goods-item:last-child {
+  border-bottom: 1rpx solid #ffffff !important;
+} */
+
 .goods .goods-item image {
   width: 210rpx;
   height: 210rpx;

+ 1 - 0
pages/search/index.js

@@ -8,6 +8,7 @@ Page({
   data: {
     appAssetsUrl: app.appAssetsUrl,
     appAssetsUrl2: app.appAssetsUrl2,
+    appAssetsUrl3: app.appAssetsUrl3,
     nodata: util.nodata(),
     statusBarHeight: 0,
     staHeight: 0,

+ 3 - 4
pages/search/index.wxml

@@ -21,10 +21,9 @@
           wx:for="{{listData}}" wx:key="item" bindtap="toPartDetail">
           <view class="img-sex">
             <!-- {{appAssetsUrl2}}wjxy/mine/vip-icon.png /images/wjxy/boy.png -->
-            <image
-              src="{{ item.sexlimit == '01' ? appAssetsUrl2 + 'wjxy/boy.png' : item.sexlimit == '02' ? appAssetsUrl2+'wjxy/girl.png' : appAssetsUrl2+'wjxy/boy_girl.png' }}"
-              class="{{ item.sexlimit == '01' ? 'per-img1' : item.sexlimit == '02' ? 'per-img2' : 'per-img3' }}">
-            </image>
+            <!--<image src="{{ item.sexlimit == '01' ? appAssetsUrl2 + 'wjxy/boy.png' : item.sexlimit == '02' ? appAssetsUrl2+'wjxy/girl.png' : appAssetsUrl2+'wjxy/boy_girl.png' }}" class="{{ item.sexlimit == '01' ? 'per-img1' : item.sexlimit == '02' ? 'per-img2' : 'per-img3' }}"></image>-->
+
+            <image src="{{ item.sexlimit == '01' ?  appAssetsUrl3 + 'online/boy.png' : item.sexlimit == '02' ?  appAssetsUrl3+'online/girl.png' :  appAssetsUrl3+'online/boy_girl.png' }}" class="{{'per-img3'}}"></image>
           </view>
           <view class="right-box">
             <view class="catetop">

+ 16 - 9
pages/search/index.wxss

@@ -89,6 +89,7 @@ page {
 
 .content {
   padding: 30rpx 32rpx 30rpx 32rpx;
+  box-sizing: border-box;
 }
 
 /* 潮兼职 */
@@ -98,15 +99,18 @@ page {
   background: white;
   border-bottom: 1px solid #e6e6e6;
   display: flex;
-  align-items: center;
+  /* align-items: center; */
 }
 .right-box {
-  width: 544rpx;
+  /* width: 544rpx; */
+  flex: 1;
+  box-sizing: border-box;
 }
 .img-sex {
-  width: 142rpx;
-  display: flex;
-  align-items: center;
+  flex-shrink: 0;
+  /* width: 142rpx; */
+  /* display: flex;
+  align-items: center; */
 }
 .per-img1 {
   width: 27rpx;
@@ -123,11 +127,13 @@ page {
   margin-left: 33rpx;
 }
 .per-img3 {
-  width: 77rpx;
-  height: 72rpx;
+  /* width: 77rpx;
+  height: 72rpx; */
+  width: 125rpx;
+  height: 126rpx;
   flex-shrink: 0;
-  margin-right: 50rpx;
-  margin-left: 17rpx;
+  margin-right: 20rpx;
+  /* margin-left: 17rpx; */
 }
 .categoryitem .label {
   font-size: 26rpx;
@@ -166,6 +172,7 @@ page {
   align-items: flex-end;
   justify-content: space-between;
   position: relative;
+  box-sizing: border-box;
 }
 .type-box-sex {
   display: flex;

+ 6 - 3
pointExchange/pages/center/center.wxml

@@ -19,12 +19,15 @@
 						<image wx:if="{{item.scoreEvent=='每日登录'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon3.png"></image>
 						<image wx:if="{{item.scoreEvent=='成功邀请好友' ||  item.scoreEvent=='邀请好友'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon4.png"></image>
 						<image wx:if="{{item.scoreEvent=='购买会员' ||  item.scoreEvent=='开通会员'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon5.png"></image>
-						<image wx:if="{{item.scoreEvent=='参加兼职/成长会' ||  item.scoreEvent=='参加兼职'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon6.png"></image>
+						<image wx:if="{{item.scoreEvent=='参加兼职/成长会'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon6.png"></image>
 						<image wx:if="{{item.scoreEvent=='评价'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon7.png"></image>
 						<image wx:if="{{item.scoreEvent=='商城兑换'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon8.png"></image>
 						<image wx:if="{{item.scoreEvent=='每日签到'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/task-icon9.png"></image>
-						<image wx:if="{{item.scoreEvent=='活动报名抵扣的积分' || item.scoreEvent=='会员升级抵扣的积分' || item.scoreEvent=='兼职报名抵扣的积分'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_13.png"></image>
-						<image wx:if="{{item.scoreEvent=='看广告得积分' || item.scoreEvent=='观看广告'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_14.png"></image>
+						<image wx:if="{{item.scoreEvent=='活动报名抵扣的积分' || item.scoreEvent=='会员升级抵扣的积分' || item.scoreEvent=='兼职报名抵扣的积分'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_15.png"></image>
+						<image wx:if="{{item.scoreEvent=='看广告得积分' || item.scoreEvent=='观看广告'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_13.png"></image>
+						
+						<image wx:if="{{item.scoreEvent=='参加兼职'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_9.png"></image>	
+						<image wx:if="{{item.scoreEvent=='参加活动'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_14.png"></image>
 
 						<image wx:if="{{item.scoreEvent=='取消活动返还积分'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_11.png"></image>
 						<image wx:if="{{item.scoreEvent=='取消兼职返还积分'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_12.png"></image>