chengziding преди 2 месеца
родител
ревизия
d1fd89959f

+ 10 - 10
app.js

@@ -8,8 +8,8 @@ App({
    * 全局变量
    */
   // apiRoot: "https://wj.songlanyun.com/wjxy/api/", // 正式环境api地址
-  // apiRoot: 'http://192.168.0.78:8687/qyh/api/',  
-  apiRoot: 'http://192.168.0.181:8687/qyh/api/',  
+  // apiRoot: 'http://192.168.0.78: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/',
   siteInfo: require("siteinfo.js"),
@@ -44,7 +44,7 @@ App({
       wx.showModal({
         title: "更新提示",
         content: "新版本已经准备好,是否重启应用?",
-        success(res) {
+        success (res) {
           if (res.confirm) {
             // 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
             updateManager.applyUpdate();
@@ -101,7 +101,7 @@ App({
     // that.font();
   },
 
-  font() {
+  font () {
     wx.loadFontFace({
       family: "FZZhunYuan-M02S",
       global: true,
@@ -135,11 +135,11 @@ App({
       },
     });
   },
-  getLocal() {
+  getLocal () {
     const _this = this;
     wx.getLocation({
       type: "gcj02",
-      success(res) {
+      success (res) {
         const latitude = res.latitude;
         const longitude = res.longitude;
         //通过【小程序定位】获取经纬度,在通过第三方sdk获取的地址信息
@@ -157,7 +157,7 @@ App({
           }
         });
       },
-      fail() {
+      fail () {
         let pages = getCurrentPages();
         let prevpage = pages[pages.length - 1];
         if (prevpage.hasOwnProperty("loadCity")) {
@@ -183,7 +183,7 @@ App({
       fail: function (res) {
         console.log(res);
       },
-      complete: function (res) {},
+      complete: function (res) { },
     });
   },
 
@@ -208,7 +208,7 @@ App({
       success: function () {
         console.log("当前登录状态:有效");
       },
-      fail: function () {},
+      fail: function () { },
     });
 
     wx.onNetworkStatusChange(function (res) {
@@ -457,7 +457,7 @@ App({
   /**
    * 对象转URL
    */
-  urlEncode: function urlencode(data) {
+  urlEncode: function urlencode (data) {
     var _result = [];
     for (var key in data) {
       var value = data[key];

+ 4 - 2
app.wxss

@@ -4,6 +4,8 @@
 @import "wxParse/wxParse.wxss";
 
 @import "static/style.wxss";
+
+@import "/assets/iconfont/iconfont.wxss";
 .container {
 	height: 100%;
 	display: flex;
@@ -59,7 +61,7 @@ rich-text{
 	margin-top: 15rpx;
 	align-items: baseline;
   }
-  
+
   .price .p2 {
   	font-size: 36rpx;
   	font-family: FZZhunYuan-M02S;
@@ -67,7 +69,7 @@ rich-text{
   	color: #EC2E26;
   	line-height: 45rpx;
   }
-  
+
   .price .p1 {
   	font-size: 22rpx;
   	color: #EC2E26;

Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
assets/iconfont/iconfont.js


+ 177 - 0
assets/iconfont/iconfont.json

@@ -0,0 +1,177 @@
+{
+  "id": "5026361",
+  "name": "兼职平台",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "830921",
+      "name": "地址",
+      "font_class": "dizhi",
+      "unicode": "e62e",
+      "unicode_decimal": 58926
+    },
+    {
+      "icon_id": "2742655",
+      "name": "时间",
+      "font_class": "shijian",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "12859941",
+      "name": "人数",
+      "font_class": "renshu",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "1541249",
+      "name": "开通会员",
+      "font_class": "kaitonghuiyuan",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "6339821",
+      "name": "每日签到",
+      "font_class": "meiriqiandao",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
+      "icon_id": "16357266",
+      "name": "参与活动1",
+      "font_class": "canyuhuodong1",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "40501118",
+      "name": "个人资料",
+      "font_class": "gerenziliao",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "42284750",
+      "name": "学生学籍",
+      "font_class": "xueshengxueji",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "145699",
+      "name": "电话_填充",
+      "font_class": "dianhuatianchong",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "34724588",
+      "name": "定位",
+      "font_class": "dingwei1",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "4165441",
+      "name": "兼职",
+      "font_class": "parttime_bag",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "4880431",
+      "name": "关闭",
+      "font_class": "guanbi",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "6401662",
+      "name": "教师课表",
+      "font_class": "jiaoshikebiao",
+      "unicode": "e620",
+      "unicode_decimal": 58912
+    },
+    {
+      "icon_id": "7597929",
+      "name": "24gl-arrowLeft",
+      "font_class": "24gl-arrowLeft",
+      "unicode": "eb6a",
+      "unicode_decimal": 60266
+    },
+    {
+      "icon_id": "10206410",
+      "name": "大神好友",
+      "font_class": "dashen_friends-",
+      "unicode": "e60d",
+      "unicode_decimal": 58893
+    },
+    {
+      "icon_id": "10299085",
+      "name": "已结束",
+      "font_class": "yijieshu",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "10459901",
+      "name": "默认头像-女生",
+      "font_class": "morentouxiang-nvsheng",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "11637079",
+      "name": "男生头像",
+      "font_class": "nanshengtouxiang",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "18514386",
+      "name": "会员",
+      "font_class": "huiyuan",
+      "unicode": "e732",
+      "unicode_decimal": 59186
+    },
+    {
+      "icon_id": "30894683",
+      "name": "女生",
+      "font_class": "nvsheng",
+      "unicode": "e60c",
+      "unicode_decimal": 58892
+    },
+    {
+      "icon_id": "32793035",
+      "name": "博主",
+      "font_class": "bozhu",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "37226619",
+      "name": "定位",
+      "font_class": "dingwei",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "566360",
+      "name": "箭头",
+      "font_class": "jiantou",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "2170600",
+      "name": "活动-1",
+      "font_class": "huodong-",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    }
+  ]
+}

BIN
assets/iconfont/iconfont.ttf


BIN
assets/iconfont/iconfont.woff


BIN
assets/iconfont/iconfont.woff2


+ 111 - 0
assets/iconfont/iconfont.wxss

@@ -0,0 +1,111 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 5026361 */
+  src: url('/assets/iconfont/iconfont.woff2?t=1759045297361') format('woff2'),
+       url('/assets/iconfont/iconfont.woff?t=1759045297361') format('woff'),
+       url('/assets/iconfont/iconfont.ttf?t=1759045297361') format('truetype');
+}
+
+.iconfont2 {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-dizhi:before {
+  content: "\e62e";
+}
+
+.icon-shijian:before {
+  content: "\e675";
+}
+
+.icon-renshu:before {
+  content: "\e64d";
+}
+
+.icon-kaitonghuiyuan:before {
+  content: "\e605";
+}
+
+.icon-meiriqiandao:before {
+  content: "\e606";
+}
+
+.icon-canyuhuodong1:before {
+  content: "\e647";
+}
+
+.icon-gerenziliao:before {
+  content: "\e699";
+}
+
+.icon-xueshengxueji:before {
+  content: "\e63b";
+}
+
+.icon-dianhuatianchong:before {
+  content: "\e678";
+}
+
+.icon-dingwei1:before {
+  content: "\e603";
+}
+
+.icon-parttime_bag:before {
+  content: "\e600";
+}
+
+.icon-guanbi:before {
+  content: "\e609";
+}
+
+.icon-jiaoshikebiao:before {
+  content: "\e620";
+}
+
+.icon-24gl-arrowLeft:before {
+  content: "\eb6a";
+}
+
+.icon-dashen_friends-:before {
+  content: "\e60d";
+}
+
+.icon-yijieshu:before {
+  content: "\e601";
+}
+
+.icon-morentouxiang-nvsheng:before {
+  content: "\e674";
+}
+
+.icon-nanshengtouxiang:before {
+  content: "\e6c9";
+}
+
+.icon-huiyuan:before {
+  content: "\e732";
+}
+
+.icon-nvsheng:before {
+  content: "\e60c";
+}
+
+.icon-bozhu:before {
+  content: "\e602";
+}
+
+.icon-dingwei:before {
+  content: "\e63c";
+}
+
+.icon-jiantou:before {
+  content: "\e64a";
+}
+
+.icon-huodong-:before {
+  content: "\e604";
+}
+

BIN
assets/images/home/icon_6.png


BIN
assets/images/home/icon_7.png


+ 0 - 2
pages/common.wxss

@@ -1,5 +1,4 @@
 /* 全局样式*/
-
 @font-face {
   font-family: "iconfont";
   src: url('iconfont.eot?t=1558316944757');
@@ -1051,7 +1050,6 @@ image {
   width: 100% !important;
 }
 
-
 /* cyz的iconfont */
 .iconfont-c3{
 	font-family: "cyz-iconfont1";

+ 32 - 18
pages/home/index/activityDetail/activityDetail.wxml

@@ -1,6 +1,7 @@
 <import src="../../../../wxParse/wxParse.wxml" />
 <view class="partcontent">
-  <image src="{{detail.bannerImg ? detail.bannerImg : appAssetsUrl2+'wjxy/activebg.png'}}" lazy-load="{{true}}" class="partbg" />
+  <image src="{{detail.bannerImg ? detail.bannerImg : appAssetsUrl2+'wjxy/activebg.png'}}" lazy-load="{{true}}"
+    class="partbg" />
   <view class='partime-container'>
     <view class="acitemwrap">
       <!-- <view class="flex-bet w100  apwrap">
@@ -27,7 +28,8 @@
             <view class="type" wx:if="{{ detail.isNeedVip == 1 }}">青雲慧会员免费</view>
           </view>
           <!-- {{item.statusName === '进行中' ? 'activestatus' : item.statusName === '报名中' ? 'baostatus' : item.statusName === '已结束' ? 'endstatus' : item.statusName === '已报满' ? 'mstatus' : 'nostatus'}} -->
-          <view class="sub-btn {{detail.statusName === '进行中' ? 'activestatus' : detail.statusName === '报名中' ? 'baostatus' : detail.statusName === '已结束' ? 'endstatus' : detail.statusName === '已报满' ? 'mstatus' : 'nostatus'}}">
+          <view
+            class="sub-btn {{detail.statusName === '进行中' ? 'activestatus' : detail.statusName === '报名中' ? 'baostatus' : detail.statusName === '已结束' ? 'endstatus' : detail.statusName === '已报满' ? 'mstatus' : 'nostatus'}}">
             {{detail.statusName}}
           </view>
         </view>
@@ -59,12 +61,16 @@
       </view>
       <!-- 个人信息 -->
       <view class="user-box">
-        <image mode="aspectFill" src="{{schoolInfo.memberphoto ? schoolInfo.memberphoto : appAssetsUrl2 + 'wjxy/login.png'}}" lazy-load="{{true}}" class="user-img" />
+        <image mode="aspectFill"
+          src="{{schoolInfo.memberphoto ? schoolInfo.memberphoto : appAssetsUrl2 + 'wjxy/login.png'}}"
+          lazy-load="{{true}}" class="user-img" />
         <view class="user-right">
           <view>
             <view class="name-sex">
               <view wx:if="{{schoolInfo.name}}">{{schoolInfo.name}}</view>
-              <image mode="aspectFill" wx:if="{{schoolInfo.sex}}" src="{{ schoolInfo.sex == '010' ? appAssetsUrl2+'wjxy/man.png' : schoolInfo.sex == '男' ? appAssetsUrl2+'wjxy/man.png' : appAssetsUrl2+'wjxy/wumen.png'}}" class="user-sex" />
+              <image mode="aspectFill" wx:if="{{schoolInfo.sex}}"
+                src="{{ schoolInfo.sex == '010' ? appAssetsUrl2+'wjxy/man.png' : schoolInfo.sex == '男' ? appAssetsUrl2+'wjxy/man.png' : appAssetsUrl2+'wjxy/wumen.png'}}"
+                class="user-sex" />
             </view>
             <view class="zhiwei">{{roleList[schoolInfo.memberRoleStatus - 1]}}</view>
           </view>
@@ -82,7 +88,8 @@
         <view class="people">
           <view class="people-content">
             <view class="imgs" wx:if="{{isMore}}">
-              <image style="left: {{(index*35)}}px;z-index:{{10 -index}} " class="img" wx:for="{{people6}}" src="{{item.memberPhoto}}"></image>
+              <image style="left: {{(index*35)}}px;z-index:{{10 -index}} " class="img" wx:for="{{people6}}"
+                src="{{item.memberPhoto}}"></image>
               <view class="dot" style="left: {{(6*35)}}px;z-index:1" wx:if="{{peopleList.length >= 6}}">
                 ...
               </view>
@@ -135,28 +142,30 @@
       </view>
     </view>
     <view class='botm zindex' style="bottom: {{bottomLeft}}px;">
-      <view class='left' style="width:120rpx;">
+      <view class='left'>
         <view class='left-t'>
           <button open-type='share' class='left-t-l'>
             <image src='{{appAssetsUrl2}}wjxy/share.png' />
             <text class="sharebtn">分享</text>
           </button>
-          <!-- <view class='left-t-r' bindtap="collect">
-						<i class="iconfont-c3 icon-shoucang {{detail.collect?'isyn':''}}"></i>
-						<text class="collect">收藏</text>
-					</view> -->
+          <view class='left-t-r' bindtap="collect">
+            <i class="iconfont-c3 icon-shoucang {{detail.collect?'isyn':''}}"></i>
+            <text class="collect">收藏</text>
+          </view>
         </view>
       </view>
       <view class="btn-box">
         <view class="see-code" bindtap="seeCode">查看二维码</view>
-        <view wx:if="{{!detail.activityStuYN}}" class="btn mainbg {{detail.statusName == '报名中'?'':'greybg'}}" bindtap="submit">
+        <view wx:if="{{!detail.activityStuYN}}" class="btn mainbg {{detail.statusName == '报名中'?'':'greybg'}}"
+          bindtap="submit">
           <text>立即报名</text>
         </view>
         <view wx:if="{{detail.activityStuYN}}" class='btn greybg'>
           <text>已报名</text>
         </view>
       </view>
-      <popup2 id='popup3' title='查看二维码' content="{{['']}}" btn2="{{false}}" btn_no='' btn_ok='知道了' bind:error="_error" bind:success="_success" data-name="popup3">
+      <popup2 id='popup3' title='查看二维码' content="{{['']}}" btn2="{{false}}" btn_no='' btn_ok='知道了' bind:error="_error"
+        bind:success="_success" data-name="popup3">
         <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">
           <view class="code-tip" wx:if="{{detail.contactInstructions}}">
             {{detail.contactInstructions}}
@@ -164,7 +173,8 @@
           <image class="code-img" src='{{detail.qrCodePicture}}' bindtap="seeBigCode" />
         </view>
       </popup2>
-      <popup2 id='popup4' title='提示' isCancel="{{true}}" content="{{['']}}" btn_no='继续支付' btn_ok='查看会员权益' bind:error2="_error2" bind:error="_error" bind:success="_success" data-name="popup4" data-cancel="1">
+      <popup2 id='popup4' title='提示' isCancel="{{true}}" content="{{['']}}" btn_no='继续支付' btn_ok='查看会员权益'
+        bind:error2="_error2" bind:error="_error" bind:success="_success" data-name="popup4" data-cancel="1">
         <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">
           <view class="msg-tip1">活动为潮兼职免费</view>
           <!-- <view class="msg-tip2">是否开通/升级会员</view> -->
@@ -198,7 +208,8 @@
             </view>
           </view>
         </popup2> -->
-      <bottomPopup id='popup5' title='确认报名' content="{{['']}}" self="{{true}}" btn2="{{false}}" btn_no='' btn_ok='' bind:error="_error" bind:success="_success" data-name="popup5" bg="#f8f8f8">
+      <bottomPopup id='popup5' title='确认报名' content="{{['']}}" self="{{true}}" btn2="{{false}}" btn_no='' btn_ok=''
+        bind:error="_error" bind:success="_success" data-name="popup5" bg="#f8f8f8">
         <view slot="content" class="content-bottom">
           <view class="content-price">
             <text class="content-unit">¥</text>
@@ -217,13 +228,14 @@
                   <text>{{dmoney}}</text>
                   <text>元</text>
                 </view>
-                <view class="di" style="margin-top: 10rpx;">{{  1500 }}</view>
+                <view class="di" style="margin-top: 10rpx;">{{ 1500 }}</view>
               </view>
               <view class="switch {{ open ? '' : 'close-bg' }}" bindtap="changeSwitch">
                 <view class="switch-dot {{ open ? '' : 'close-switch' }}"></view>
               </view>
             </view>
-            <view class="pay-btn" wx:if="{{(open&&actualPrice==0) || !open&&detail.money==0 }}" bindtap="confirmPay" style="margin-bottom: 38rpx;">
+            <view class="pay-btn" wx:if="{{(open&&actualPrice==0) || !open&&detail.money==0 }}" bindtap="confirmPay"
+              style="margin-bottom: 38rpx;">
               立即报名
             </view>
             <view class="pay-btn" wx:else bindtap="confirmPay" style="margin-bottom: 38rpx;">
@@ -232,10 +244,12 @@
           </view>
         </view>
       </bottomPopup>
-      <popup2 id='popup' title='提示' content="{{['']}}" btn_no='取消' btn_ok='确认' bind:error="_error" bind:success="_success" data-name="popup">
+      <popup2 id='popup' title='提示' content="{{['']}}" btn_no='取消' btn_ok='确认' bind:error="_error"
+        bind:success="_success" data-name="popup">
         <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">该活动需要开通VIP才能报名</view>
       </popup2>
-      <popup2 id='popup2' title='提示' content="{{['']}}" btn_no='取消' btn_ok='立即完善' bind:error="_error" bind:success="_success" data-name="popup2">
+      <popup2 id='popup2' title='提示' content="{{['']}}" 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>
       </popup2>
     </view>

+ 4 - 1
pages/home/index/activityDetail/activityDetail.wxss

@@ -916,6 +916,9 @@ page {
   font-size: 28rpx;
   line-height: 75rpx;
 }
+/* .left-t-l{
+  margin: 0 20rpx;
+} */
 .btn-box {
   display: flex;
   justify-content: space-between;
@@ -939,7 +942,7 @@ page {
   line-height: 85rpx;
 }
 .btn {
-  width: 330rpx;
+  width: 300rpx;
   height: 85rpx;
   border-radius: 43rpx;
   color: #0a0a0a;

+ 1 - 1
pages/home/index/memberArea/memberArea.wxss

@@ -179,7 +179,7 @@ background:#F53E37;
 	position: absolute;
 	right: 10rpx;
 	top: 97rpx;
- 
+
 }
 .list-full text{
 	padding: 10rpx 18rpx;

+ 19 - 12
pages/home/index/partDetail/partDetail.wxml

@@ -135,7 +135,8 @@
       <view class="people">
         <view class="people-content">
           <view class="imgs" wx:if="{{isMore}}">
-            <image style="left: {{(index*35)}}px;z-index:{{10 -index}} " class="img" wx:for="{{people6}}" src="{{item.memberPhoto}}"></image>
+            <image style="left: {{(index*35)}}px;z-index:{{10 -index}} " class="img" wx:for="{{people6}}"
+              src="{{item.memberPhoto}}"></image>
             <view class="dot" style="left: {{(6*35)}}px;z-index:1" wx:if="{{peopleList.length > 6}}">
               ...
             </view>
@@ -287,21 +288,22 @@
 			</view>
 		</view> -->
     <view class='botm zindex' style="bottom: {{bottomLeft}}px;">
-      <view class='left' style="width:120rpx;">
+      <view class='left'>
         <view class='left-t'>
           <button open-type='share' class='left-t-l'>
             <image src='{{appAssetsUrl2}}wjxy/share.png' />
             <text class="sharebtn">分享</text>
           </button>
-          <!-- <view class='left-t-r' bindtap="collect">
-						<i class="iconfont-c3 icon-shoucang {{detail.collect?'isyn':''}}"></i>
-						<text class="collect">收藏</text>
-					</view> -->
+          <view class='left-t-r' bindtap="collect">
+            <i class="iconfont-c3 icon-shoucang {{detail.collect?'isyn':''}}"></i>
+            <text class="collect">收藏</text>
+          </view>
         </view>
       </view>
       <view class="btn-box">
         <view class="see-code" bindtap="seeCode">查看二维码</view>
-        <view wx:if="{{!detail.workStuYN}}" class="btn mainbg {{detail.statusName == '预定中'?'':'greybg'}}" bindtap="submit">
+        <view wx:if="{{!detail.workStuYN}}" class="btn mainbg {{detail.statusName == '预定中'?'':'greybg'}}"
+          bindtap="submit">
           <text class="text-bao">立即报名</text>
           <view class="text-b">(已报 {{detail.signnum}}/实招 {{detail.willnum}})</view>
         </view>
@@ -310,22 +312,27 @@
           <view class="text-b">(已报 {{detail.signnum}}/实招 {{detail.willnum}})</view>
         </view>
       </view>
-      <popup2 id='popup0' title='查看二维码' content="{{['']}}" btn2="{{false}}" btn_no='' btn_ok='知道了' bind:error="_error" bind:success="_success" data-name="popup0">
+      <popup2 id='popup0' title='查看二维码' content="{{['']}}" btn2="{{false}}" btn_no='' btn_ok='知道了' bind:error="_error"
+        bind:success="_success" data-name="popup0">
         <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">
           <view class="code-tip">{{detail.contactInstructions}}</view>
           <image class="code-img" src='{{detail.qrCodePicture}}' bindtap="seeBigCode" />
         </view>
       </popup2>
-      <popup2 id='popup' title='提示' content="{{['']}}" btn_no='取消' btn_ok='确认' bind:error="_error" bind:success="_success" data-name="popup">
+      <popup2 id='popup' title='提示' content="{{['']}}" btn_no='取消' btn_ok='确认' bind:error="_error"
+        bind:success="_success" data-name="popup">
         <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">该兼职需要开通VIP才能报名</view>
       </popup2>
-      <popup2 id='popup2' title='提示' content="{{['']}}" btn_no='取消' btn_ok='立即完善' bind:error="_error" bind:success="_success" data-name="popup2">
+      <popup2 id='popup2' title='提示' content="{{['']}}" 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>
       </popup2>
-      <popup2 id='popup4' title='提示' content="{{['']}}" btn_no='取消' btn_ok='确认报名' bind:error="_error" bind:success="_success" data-name="popup4">
+      <popup2 id='popup4' title='提示' content="{{['']}}" btn_no='取消' btn_ok='确认报名' bind:error="_error"
+        bind:success="_success" data-name="popup4">
         <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">确认报名该兼职?</view>
       </popup2>
-      <popup2 id='popup3' title='会员必读' self="{{true}}" truecontent="{{['']}}" btn_no='' btn_ok='' bind:error="_error" bind:success="_success" data-name="popup3">
+      <popup2 id='popup3' title='会员必读' self="{{true}}" truecontent="{{['']}}" btn_no='' btn_ok='' bind:error="_error"
+        bind:success="_success" data-name="popup3">
         <view slot="content" style="width: 85%;padding: 40rpx 30rpx;">
           <template is="wxParse" data="{{wxParseData:vipMsg.nodes}}" class="partime-detail-info" />
         </view>

+ 1 - 1
pages/home/index/partDetail/partDetail.wxss

@@ -25,7 +25,7 @@ page {
   height: 347rpx;
 }
 .btn {
-  width: 330rpx;
+  width: 300rpx;
   height: 85rpx;
   border-radius: 43rpx;
   color: #ffffff;

+ 24 - 23
pages/my/myCollection/myCollection.js

@@ -16,7 +16,8 @@ Page({
 		}, {
 			name: '收藏的活动',
 			value: '02'
-		}],
+		},
+		],
 		typeListIndex: 0,
 		nodata: util.nodata(),
 		params: {
@@ -25,15 +26,15 @@ Page({
 			vipid: '',
 			type: ''
 		},
-		total:{
+		total: {
 			currPage: 0,
 			totalPage: 0
 		},
-		noMore:false,
-		listData:[],
+		noMore: false,
+		listData: [],
 	},
 
-	switchType(e) {
+	switchType (e) {
 		if (e) {
 			let typeListIndex = e.currentTarget.dataset.index;
 			this.setData({
@@ -45,7 +46,7 @@ Page({
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
-	onLoad: function(options) {
+	onLoad: function (options) {
 		if (util.getUserId()) {
 			this.data.params.sid = util.getUserId()
 		} else {
@@ -54,19 +55,19 @@ Page({
 		this.loadList(true);
 	},
 
-	seeDetails(e) {
+	seeDetails (e) {
 		if (this.data.typeListIndex == 0) {
 			wx.navigateTo({
 				url: '/pages/home/index/partDetail/partDetail?id=' + e.currentTarget.dataset.id,
 			})
-		}else{
+		} else {
 			wx.navigateTo({
 				url: '/pages/home/index/activityDetail/activityDetail?id=' + e.currentTarget.dataset.id
 			})
 		}
 	},
 
-	loadList(isRefresh) {
+	loadList (isRefresh) {
 		let that = this;
 		if (!isRefresh && this.data.noMore) {
 			wx.showToast({
@@ -80,18 +81,18 @@ Page({
 			noMore: isRefresh ? false : this.data.noMore,
 			params: {
 				...this.data.params,
-				page: isRefresh?1:this.data.params.page+1,
-				type: this.data.typeListIndex+1
+				page: isRefresh ? 1 : this.data.params.page + 1,
+				type: this.data.typeListIndex + 1
 			}
 		})
 		wx.showLoading({
 			title: '努力加载中...',
 		})
 		app._post_form('favorite/getFavoriteByVipid', '', this.data.params,
-			function(res) {
+			function (res) {
 				if (res.code == 0) {
-					if(res.page.list.length>0 && that.data.listData.length>0 && res.page.list[0].id == that.data.listData[0].id){
-						return ;
+					if (res.page.list.length > 0 && that.data.listData.length > 0 && res.page.list[0].id == that.data.listData[0].id) {
+						return;
 					}
 					let listData = that.data.listData;
 					listData.push(...res.page.list);
@@ -103,7 +104,7 @@ Page({
 					})
 				}
 			},
-			function(res) {
+			function (res) {
 				wx.hideLoading()
 			})
 	},
@@ -111,13 +112,13 @@ Page({
 	/**
 	 * 生命周期函数--监听页面初次渲染完成
 	 */
-	onReady: function() {
-		
+	onReady: function () {
+
 	},
 	/**
 	 * 生命周期函数--监听页面显示
 	 */
-	onShow: function() {
+	onShow: function () {
 
 
 	},
@@ -125,35 +126,35 @@ Page({
 	/**
 	 * 生命周期函数--监听页面隐藏
 	 */
-	onHide: function() {
+	onHide: function () {
 
 	},
 
 	/**
 	 * 生命周期函数--监听页面卸载
 	 */
-	onUnload: function() {
+	onUnload: function () {
 
 	},
 
 	/**
 	 * 页面相关事件处理函数--监听用户下拉动作
 	 */
-	onPullDownRefresh: function() {
+	onPullDownRefresh: function () {
 
 	},
 
 	/**
 	 * 页面上拉触底事件的处理函数
 	 */
-	onReachBottom: function() {
+	onReachBottom: function () {
 		this.loadList();
 	},
 
 	/**
 	 * 用户点击右上角分享
 	 */
-	onShareAppMessage: function() {
+	onShareAppMessage: function () {
 
 	}
 })

+ 67 - 64
pages/my/myCollection/myCollection.wxml

@@ -1,74 +1,77 @@
 <view class='w100 view-type flex-a-center' style="justify-content: space-around;">
-  <view wx:for="{{typeList}}" class="view-li" data-index="{{index}}" bindtap="switchType">
-    <text class="{{typeListIndex===index?'li-text-active':''}}">{{item.name}}</text>
-  </view>
+	<view wx:for="{{typeList}}" class="view-li {{typeListIndex===index?'li-text-active':''}}" data-index="{{index}}"
+		bindtap="switchType">
+		<text class="">{{item.name}}</text>
+	</view>
 </view>
 <!-- 兼职 -->
 <view wx:if="{{typeListIndex==0}}" class="mycollection">
-  <block wx:if="{{listData.length>0}}">
-    <view class="categoryitem" data-id="{{item.work.id}}" wx:for="{{listData}}" wx:key="item" bindtap="seeDetails">
-    		<view class="catetop">
-    				<text class="titlex">{{item.work.title}}</text>
-    				<view class="price">
-    						<text class="p1">¥</text>
-    						<text class="p2">{{item.work.price}}</text>
-    						<text class="p1">/{{item.work.unitName}}</text>
-    				</view>
-    		</view>
-    		<text wx:for="{{[item.work.categoryName,item.work.typeName,item.work.sexlimitName]}}" wx:for-item="item2">
-    			<text class="label">{{item2}}</text>
-    			<text class="label" wx:if="{{index<2}}">|</text>
-    		</text>
-    		<view>
-    			<button class="label2" wx:for="{{item.work.tags}}">{{item.tag}}</button>
-    		</view>
-    		<view class="catebottom">
-    				<i class="iconfont icon-dizhi icon-home-dizhi"></i>
-    				<view class="address">{{item.work.address}}</view>
-    				<view class="sub-btn-box">
-    					<button class="sub-btn {{item.work.statusName=='预定中'?'green':''}}">{{item.work.statusName}}</button>
-    				</view>
-    		</view>
-    </view>
-  </block>
-  <block wx:if="{{listData.length==0}}">
-    <view class='tc h100'>
-      <image src="{{nodata}}" class='nodata-img'></image>
-    </view>
-  </block>
+	<block wx:if="{{listData.length>0}}">
+		<view class="categoryitem" data-id="{{item.work.id}}" wx:for="{{listData}}" wx:key="item" bindtap="seeDetails">
+			<view class="catetop">
+				<text class="titlex">{{item.work.title}}</text>
+				<view class="price">
+					<text class="p1">¥</text>
+					<text class="p2">{{item.work.price}}</text>
+					<text class="p1">/{{item.work.unitName}}</text>
+				</view>
+			</view>
+			<view class="catebottom">
+				<i class="iconfont icon-dizhi icon-home-dizhi"></i>
+				<view class="address">{{item.work.address}}</view>
+				<view class="sub-btn-box">
+					<button class="sub-btn {{item.work.statusName=='预定中'?'green':''}}">{{item.work.statusName}}</button>
+				</view>
+			</view>
+			<text wx:for="{{[item.work.categoryName,item.work.typeName,item.work.sexlimitName]}}" wx:for-item="item2">
+				<text class="label">{{item2}}</text>
+				<text class="label" wx:if="{{index<2}}">|</text>
+			</text>
+			<view>
+				<button class="label2" wx:for="{{item.work.tags}}">{{item.tag}}</button>
+			</view>
+		</view>
+	</block>
+	<block wx:if="{{listData.length==0}}">
+		<view class='tc h100'>
+			<image src="{{nodata}}" class='nodata-img'></image>
+		</view>
+	</block>
 </view>
 <!-- 活动 -->
 <view wx:if="{{typeListIndex==1}}" class="mycollection">
-  <block wx:if="{{listData.length>0}}">
-    <view class='boxm boxmfix' data-id="{{item.activity.id}}" bindtap='seeDetails' wx:for="{{listData}}">
-    	<view class="rel img-view">
-    		<image src='{{item.activity.thumbnailImg}}' lazy-load='true'
-    			mode="aspectFill"></image>
-    		<view class="status {{item.activity.statusName === '报名中' ? 'activestatus' : 'nostatus'}}">
-    			{{item.activity.statusName}}</view>
-    	</view>
-    	<view class="txt-con txt-con-fix">
-    		<view class="title">{{item.activity.title}}</view>
-    		<view class="item">
-    			<image mode="widthFix" src="{{appAssetsUrl}}/images/date-icon.png" style="width: 28rpx;" />
-    			<text style="font-size: 26rpx;">时间:{{item.activity.startTime}}-{{item.activity.endTime}}</text>
-    		</view>
-    		<view class="item">
-    			<image mode="widthFix" src="{{appAssetsUrl}}/images/location-icon.png" />
-    			<text>{{item.activity.address}}</text>
-    		</view>
-    		<view class="item">
-    			<text>名额:</text>
-    			<text class="red">200人</text>
-    		</view>
-    	</view>
-    </view>
-  </block>
-  <block wx:if="{{listData.length==0}}">
-    <view class='tc h100'>
-      <image src="{{nodata}}" class='nodata-img'></image>
-    </view>
-  </block>
+	<block wx:if="{{listData.length>0}}">
+		<view class='boxm boxmfix' data-id="{{item.activity.id}}" bindtap='seeDetails' wx:for="{{listData}}">
+			<view class="rel img-view">
+				<image src='{{item.activity.thumbnailImg}}' lazy-load='true' mode="aspectFill"></image>
+				<!-- {{item.activity.statusName === '报名中' ? 'activestatus' : 'nostatus'}} -->
+				<view class="status "
+					style="{{item.activity.statusName === '报名中' ? 'background-image: url(/assets/images/home/icon_5.png)' : 'background-image: url(/assets/images/home/icon_6.png)'}}">
+					{{item.activity.statusName}}
+				</view>
+			</view>
+			<view class="txt-con txt-con-fix">
+				<view class="title">{{item.activity.title}}</view>
+				<view class="item">
+					<image mode="widthFix" src="{{appAssetsUrl}}/images/date-icon.png" style="width: 28rpx;" />
+					<text style="font-size: 26rpx;">时间:{{item.activity.startTime}}-{{item.activity.endTime}}</text>
+				</view>
+				<view class="item">
+					<image mode="widthFix" src="{{appAssetsUrl}}/images/location-icon.png" />
+					<text>{{item.activity.address}}</text>
+				</view>
+				<view class="item">
+					<text>名额:</text>
+					<text class="red">200人</text>
+				</view>
+			</view>
+		</view>
+	</block>
+	<block wx:if="{{listData.length==0}}">
+		<view class='tc h100'>
+			<image src="{{nodata}}" class='nodata-img'></image>
+		</view>
+	</block>
 </view>
 <!-- <button class="custCare" open-type="contact" session-from="sessionFrom">
 	<image mode="aspectFill" src="{{appAssetsUrl}}/images/custCare.png"></image>

+ 59 - 35
pages/my/myCollection/myCollection.wxss

@@ -26,10 +26,13 @@
 }
 
 page{
-	padding: 0 30rpx;
+	/* padding: 0 30rpx; */
 	box-sizing: border-box;
+  background-color: #FFFFFF;
+}
+.view-type{
+  background-color: #FFFFFF;
 }
-
 .view-li-wrap{
 padding:30rpx;
 box-sizing: border-box;
@@ -38,11 +41,12 @@ box-sizing: border-box;
   /* width: 30%; */
   padding: 30rpx 0;
   box-sizing:border-box;
-  font-size: 32rpx;
+  font-size: 30rpx;
   text-align: center;
+  color: #1A1A1A;
 }
 
-.view-li>text{
+/* .view-li>text{
   display: block;
   position: relative;
   padding: 6rpx 25rpx;
@@ -56,12 +60,14 @@ box-sizing: border-box;
   background: transparent;
   letter-spacing: -1rpx;
 
-}
+} */
 
-.view-li .li-text-active{
-  transition: all .5s;
-  background: #9DDB52;
-  color:white;
+.li-text-active{
+  /* transition: all .5s; */
+  color:#2B58A5;
+  font-size: 34rpx;
+  font-weight: 700;
+  border-bottom: 4rpx solid #2B58A5;
 }
 
 
@@ -82,7 +88,7 @@ box-sizing: border-box;
   height: 100%;
   position: absolute;
   left: 0;
-  top: 0; 
+  top: 0;
   text-align: center;
   background: rgba(0,0,0,.5);
   border-radius: 24rpx;
@@ -173,7 +179,7 @@ margin-top:10rpx;
   font-weight: Regular;
   margin-left: 25rpx;
   bottom: 8rpx;
-  text-align: center; 
+  text-align: center;
   }
  /* icon 栏样式 */
 .two-icon{
@@ -209,8 +215,13 @@ white-space: nowrap;
 .mycollection{
   display: flex;
   flex-direction: column;
-  width:690rpx;
+  width:100%;
+  min-height: 90vh;
   margin:0 auto;
+  border-radius: 40rpx 40rpx 0rpx 0rpx;
+  background: #F7F8FA;
+  padding: 40rpx 30rpx;
+  box-sizing: border-box;
 }
 .adico{
   width: 22rpx;
@@ -462,32 +473,33 @@ white-space: nowrap;
 
 /* 新样式 */
 .categoryitem {
-	padding: 22rpx 46rpx;
+	padding: 30rpx 30rpx;
 	box-sizing: border-box;
 	background: white;
 	margin-bottom: 15rpx;
+  position: relative;
+  border-radius: 20rpx;
 }
 
 .categoryitem .label {
 	font-size: 26rpx;
 	font-weight: 400;
-	color: #767676;
+	color: #EC931A;
 	margin-right: 10rpx;
 	display: inline-block;
 }
 
 .categoryitem .label2 {
 	box-sizing: content-box;
-	font-size: 24rpx;
+	font-size: 22rpx;
 	font-weight: 400;
 	color: #767676;
 	height: 38rpx;
 	line-height: 38rpx;
-	padding: 0 12rpx;
-	margin: 10rpx 10rpx 0 0;
-	background: rgba(255, 255, 255, 0.00);
-	border: 1px solid #d7d7d7;
-	border-radius: 4rpx;
+	padding: 3rpx 15rpx;
+	margin: 20rpx 13rpx 0 0;
+	background: #F0F1F5;
+	border-radius: 10rpx;
 	display: inline-block;
 }
 
@@ -514,11 +526,16 @@ white-space: nowrap;
 	font-size: 34rpx;
 	font-weight: 500;
 	color: #2b2b2b;
+  font-weight: 700;
 }
 
 .catetop .price {
 	display: flex;
 	flex-direction: row;
+  position: absolute;
+  right: 0;
+  bottom: 108rpx;
+  right: 25rpx;
 }
 
 .catetop .price .p2 {
@@ -547,7 +564,7 @@ white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
-	width: 330rpx;
+	width: 440rpx;
 	font-size: 28rpx;
 	font-weight: 400;
 	text-align: left;
@@ -556,10 +573,14 @@ white-space: nowrap;
 
 .catebottom .sub-btn-box {
 	display: inline-block;
-	width: calc(100% - 375rpx);
+	/* width: calc(100% - 375rpx); */
 	text-align: right;
 	vertical-align: text-top;
 	margin-top: -10rpx;
+  position: absolute;
+  bottom: 32rpx;
+  right: 25rpx;
+  font-size: 0;
 }
 
 .catebottom .sub-btn {
@@ -627,8 +648,8 @@ display: flex;
 }
 
 .img-view{
-  width: 240rpx;
-  height: 240rpx;
+  width: 210rpx;
+  height: 210rpx;
   opacity: 1;
   background: rgba(0,0,0,0.00);
   border-radius: 20rpx 0px 0px 20rpx;
@@ -686,18 +707,22 @@ display: flex;
    position: absolute;
    left: 0;
    top: 0;
-   font-size: 28rpx;
-   width: 112rpx;
-   height: 39rpx;
-	 text-align: center;
-   background: rgba(0,0,0,.6);
+   font-size: 24rpx;
+   width: 115rpx;
+  height: 50rpx;
+  line-height: 50rpx;
    z-index: 999;
+   text-align: left;
    color: white;
-   border-radius: 20rpx 0 0 0;
-	 padding: 0 20rpx;
+   border-radius: 10rpx 0 0 0;
+	 padding: 0 10rpx;
+   background-size: 115rpx 50rpx;
+   background-repeat: no-repeat;
+   box-sizing: border-box;
 }
 .activestatus{
-  background:rgba(145,203,91,0.9)
+  /* background:rgba(145,203,91,0.9) */
+  /* background: url('../../images/home/icon_5.png'); */
 }
 .nostatus{
   background: rgba(251,177,120,0.9);
@@ -733,7 +758,7 @@ display: flex;
   width: 100%;
 }
 page{
-  background: #f7f7f7!important;
+  background: #fff!important;
 }
 .img-content{
   padding-top:20rpx;
@@ -810,10 +835,9 @@ page{
 	vertical-align: middle;
 }
 .iconfont{
-	color: #9DDB52;
+	color: #999999 !important;
 	font-size: 16px;
 	margin-right: 0;
-	margin-right: 9rpx;
 }
 .iconfont.gray{
   color:#ccc;

+ 17 - 14
pages/my/myCustomer/myCustomer.js

@@ -21,8 +21,12 @@ Page({
   },
 
   // radio
-  radioChange(e) {
-    this.data.parm.fbtype = e.detail.value;
+  radioChange (e) {
+    this.data.parm.fbtype = e.currentTarget.dataset.item.itemcode;
+    this.setData({
+      parm: this.data.parm,
+    });
+
   },
   /**
    * 生命周期函数--监听页面加载
@@ -32,7 +36,7 @@ Page({
     this.loadkfInfo();
   },
 
-  loadkfInfo() {
+  loadkfInfo () {
     let _this = this;
     App._post_form(
       "wgfillinfo/apiSelectwgfillinfo",
@@ -46,14 +50,13 @@ Page({
               `<img style=' max-width:100%;'`
             ),
           });
-          console.log(_this.data.wgFillInfo, 1111);
           WxParse.wxParse("article", "html", res.wgFillInfo.ccs, _this, 5);
         }
       }
     );
   },
 
-  loadDic() {
+  loadDic () {
     let _this = this;
     App._post_form(
       "bizcatelog/apiSelectBizcatelog/fbtype",
@@ -70,13 +73,13 @@ Page({
     );
   },
 
-  input(e) {
+  input (e) {
     if (e.detail.value) {
       this.data.parm.feedback = e.detail.value;
     }
   },
 
-  sub() {
+  sub () {
     let _this = this;
     if (util.UserLoginStatus()) {
       if (this.data.parm.feedback === "") {
@@ -110,35 +113,35 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {},
+  onReady: function () { },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {},
+  onShow: function () { },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {},
+  onHide: function () { },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {},
+  onUnload: function () { },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {},
+  onPullDownRefresh: function () { },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {},
+  onReachBottom: function () { },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {},
+  onShareAppMessage: function () { },
 });

+ 12 - 3
pages/my/myCustomer/myCustomer.wxml

@@ -3,14 +3,23 @@
 <import src="../../../wxParse/wxParse.wxml" />
 <view class="customer-container">
   <rich-text nodes="{{richtext}}"></rich-text>
-  <radio-group class="radio-group radio-view" bindchange="radioChange">
+  <!-- <radio-group class="radio-group radio-view" bindchange="radioChange">
     <label class="radio" wx:for="{{items}}" wx:for-index="index">
       <radio value="{{item.itemcode}}" checked="{{index===0}}" />{{item.itemname}}
     </label>
-  </radio-group>
+  </radio-group> -->
+  <view class="radioBox">
+    <view class="item" wx:for="{{items}}" wx:for-index="index" bindtap='radioChange' data-item="{{item}}">
+      <view class="item_l {{parm.fbtype==item.itemcode?'active':''}}">
+        <view></view>
+      </view>
+      <view>{{item.itemname}}</view>
+    </view>
+  </view>
   <!-- 想说的话  文字输入 -->
   <view class='text-view'>
-    <textarea class='textarea' placeholder-class='text-pla' placeholder='请输入您的想法 ...' bindinput="input" auto-focus="true" maxlength='-1'></textarea>
+    <textarea class='textarea' placeholder-class='text-pla' placeholder='请输入您的想法 ...' bindinput="input"
+      auto-focus="true" maxlength='-1'></textarea>
   </view>
   <view class='btn' bindtap='sub'>提交</view>
 </view>

+ 42 - 9
pages/my/myCustomer/myCustomer.wxss

@@ -40,14 +40,13 @@ img {
 }
 
 .btn {
-  width: 90%;
-  padding: 20rpx 0;
+  width: 650rpx;
+  padding: 25rpx 0;
   text-align: center;
   font-size: 32rpx;
-  background: #ffdc2f;
-  margin: 15rpx auto;
+  background: #2B58A5;
+  margin: 150rpx auto 0;
   border-radius: 50rpx;
-  color: #1a1a1a;
   color: #FFFFFF;
 }
 
@@ -111,9 +110,43 @@ page {
 }
 
 .textarea {
-  /* width: 100%; */
-  height: 316rpx;
-  border: 1rpx solid #f2f2f2;
+  width: 90%;
+  height: 222rpx;
+  border: 1rpx solid #e6e6e6;
   border-radius: 10rpx;
   padding: 20rpx 27rpx;
-}
+}
+.radioBox{
+  display: flex;
+  margin: 50rpx 0 25rpx;
+}
+.radioBox .item{
+  display: flex;
+  align-items: center;
+  margin-right: 30rpx;
+}
+.radioBox .item .item_l{
+  width: 37rpx;
+  height: 37rpx;
+  border-radius: 50%;
+  border: 6rpx solid #6D6D6D;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  line-height: 0;
+  margin-right: 10rpx;
+  font-size: 24rpx;
+}
+.radioBox .item .item_l>view{
+  width: 11rpx;
+  height: 11rpx;
+  border-radius: 50%;
+  background: #6D6D6D;
+}
+.radioBox .item .active{
+  border: 6rpx solid #2B58A5;
+}
+.radioBox .item .active>view{
+   background: #2B58A5;
+}

+ 7 - 4
pages/volunteer/detail.wxss

@@ -151,8 +151,9 @@ padding:0 20rpx;
   margin-top: 45rpx;
 } */
 .left{
-  width:224rpx;
+  /* width:200rpx; */
   height: 100%;
+  margin-right: 30rpx;
 }
 .left-t{
   display: flex;
@@ -160,14 +161,16 @@ padding:0 20rpx;
   height: 100%;
 }
 .left-t-l{
-  width: 120rpx;
+  /* width: 120rpx; */
   height: 100%;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items:center;
   background: transparent;
-  border:none
+  border:none;
+  padding: 0;
+  margin: 0 20rpx
 }
 .left-t-l image {
   width: 50rpx;
@@ -176,7 +179,7 @@ padding:0 20rpx;
   margin-top: 5rpx; */
 }
 .left-t-r{
-  width: 120rpx;
+  /* width: 120rpx; */
   height: 100%;
   display: flex;
   flex-direction: column;

+ 23 - 2
project.private.config.json

@@ -2,12 +2,33 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/home/index/activityDetail/activityDetail",
+          "pathName": "pages/home/index/activityDetail/activityDetail",
+          "query": "id=96",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "pages/my/myCollection/myCollection",
+          "pathName": "pages/my/myCollection/myCollection",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/my/myCustomer/myCustomer",
+          "pathName": "pages/my/myCustomer/myCustomer",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/checkin/index",
           "pathName": "pages/checkin/index",
           "query": "",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

+ 3 - 5
static/style.wxss

@@ -5,19 +5,17 @@
     font-style: normal;
     font-display: swap;
 }
-[class^="icon-"], [class*=" icon-"] {
-  /* use !important to prevent issues with browser extensions that change fonts */
+/* [class^="icon-"], [class*=" icon-"] {
   font-family: 'iconfont1' !important;
   font-style: normal;
   font-weight: normal;
   font-variant: normal;
   text-transform: none;
   line-height: 1;
- 
-  /* Better Font Rendering =========== */
+
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-}
+} */
 .icon-a-shijiannaozhongriliriqijishiqi-11:before {
   content: "\e7ff";
 }