bug修改

.gitignore

@@ -1,14 +1,11 @@
-# Windows
 [Dd]esktop.ini
 Thumbs.db
 $RECYCLE.BIN/
 
-# macOS
 .DS_Store
 .fseventsd
 .Spotlight-V100
 .TemporaryItems
 .Trashes
 
-# Node.js
 node_modules/

miniprogram/component/empty/empty.wxml

@@ -1,6 +1,6 @@
 <!--component/empty/empty.wxml-->
-  <view class="empty">
-    <image src="{{src}}"></image>
-    <text class="empty-text">{{title}}</text>
-    <text class="empty-message">{{message}}</text>
-  </view>
+<view class="empty">
+  <image src="{{src}}" mode="widthFix" class="empty-image"></image>
+  <text class="empty-text">{{title}}</text>
+  <text class="empty-message">{{message}}</text>
+</view>

miniprogram/component/empty/empty.wxss

@@ -1,16 +1,16 @@
 /* component/empty/empty.wxss */
 
 .empty {
-  height: 70%;
+  height: 100%;
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
 }
 
-.empty image {
-  height: 260rpx;
+.empty-image {
   width: 260rpx;
+  margin-top: 180rpx;
 }
 
 .empty-text {
@@ -27,4 +27,4 @@
   font-weight: 400;
   color: rgba(0, 0, 0, 0.25);
   margin-top: 10rpx;
-}
+}

miniprogram/component/select-district/select-district.wxml

@@ -27,7 +27,7 @@
 
     </view>
   </view>
-  <view class="btn">
+  <view class="btn safe-area-bottom">
     <view class="button" bindtap="submit">确认选择</view>
   </view>
 </view>

miniprogram/pages/common-setting/common-setting.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "通用设置"
+  "navigationBarTitleText": "更多"
 }

miniprogram/pages/common-setting/common-setting.ts

@@ -34,12 +34,21 @@ Page({
   },
   // 退出登录
   logout() {
-    wx.clearStorage({
-      success: () => {
-        wx.reLaunch({
-          url: '/pages/index/index',
-        })
-      }
+    wx.showModal({
+      title: '是否退出登录',
+      cancelColor: '#888A8E',
+      confirmColor: '#31364C',
+      success: (res) => {
+        if (res.confirm) {
+          wx.clearStorage({
+            success: () => {
+              wx.navigateBack({
+                delta: 1
+              })
+            },
+          })
+        }
+      },
     })
   },
   /**

miniprogram/pages/common-setting/common-setting.wxml

@@ -38,6 +38,11 @@
 		注销账户
 	</view>
 </view>
+<view class="quit safe-area-bottom" bindtap="logout">
+	<view>
+		退出登录
+	</view>
+</view>
 <view class="cover" wx:if='{{cancellation}}'>
 
 	<view class="cover-content">

miniprogram/pages/common-setting/common-setting.wxss

@@ -1,13 +1,13 @@
 /* pages/common-setting/common-setting.wxss */
 
 page {
-  background: #F0F1F2;
+  background: #f0f1f2;
 }
 
 .logo {
   width: 750rpx;
   height: 368rpx;
-  background: #FFFFFF;
+  background: #ffffff;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -42,7 +42,7 @@ page {
   font-weight: 400;
   color: rgba(0, 0, 0, 0.85);
   padding: 32rpx 40rpx;
-  background: #FFFFFF;
+  background: #ffffff;
   box-sizing: border-box;
   display: flex;
   align-items: center;
@@ -72,7 +72,7 @@ page {
   width: 750rpx;
   height: 112rpx;
   line-height: 112rpx;
-  background: #FFFFFF;
+  background: #ffffff;
   font-size: 28rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
@@ -127,4 +127,27 @@ page {
 .cancel {
   color: #888a8e;
   border-right: 1rpx solid #cdcfd3;
-}
+}
+
+.quit {
+  width: 100%;
+  position: fixed;
+  bottom: 15rpx;
+  left: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.quit view {
+  width: 710rpx;
+  height: 102rpx;
+  line-height: 102rpx;
+  text-align: center;
+  font-size: 38rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ffffff;
+  background: #1890ff;
+  border-radius: 18rpx;
+}

miniprogram/pages/detail/detail.ts

@@ -128,17 +128,19 @@ Page({
     const userInfo = wx.getStorageSync('userInfo')
 
     if (userInfo.isDemonstrate) {
-      wx.showToast({
-        icon: 'none',
+      wx.showModal({
         title: '报名成功',
+        content: '请耐心等待企业确认',
+        showCancel: false,
+        confirmText: '知道了',
         success: () => {
           const hwOrderAPI = this.data.hwOrderAPI
-          hwOrderAPI.status = 2
+          hwOrderAPI.status = 5
           this.setData({
             status: 2,
             hwOrderAPI
           })
-          putStorageSync(`orderDetail_${this.data.id}`, this.data.id, 2)
+          putStorageSync(`orderDetail_${this.data.id}`, this.data.id, hwOrderAPI.status)
         }
       })
     }

miniprogram/pages/detail/detail.wxml

@@ -139,19 +139,19 @@
 		</view>
 		<view class="header-detail">
 			<view class="address">
-				<image src="../../imgs/address.png" class="address-image"></image>
+				<image src="../../imgs/number.png" class="address-image"></image>
 				<text>报名数：{{number || '若干'}}</text>
 			</view>
 			<view class="time">
 				<image src="../../imgs/time.png" class="time-image"></image>
-				<text>{{expiryDate}}</text>
+				<text>{{app.formatTime(requirementTime,'.','',true)}}</text>
 			</view>
 		</view>
 	</view>
 
 	<view class="company" data-name="{{companyName}}" data-address="{{provinceCityCountry}}{{address || ''}}"
 		bindtap="openMap">
-		<image src="../../imgs/offline.png" class="company-logo"></image>
+		<image src="../../imgs/company.png" class="company-logo"></image>
 		<view class="company-info">
 			<view class="company-name">{{companyName}}</view>
 			<view class="company-position">{{provinceCityCountry}}{{address || ''}}</view>
@@ -159,20 +159,20 @@
 	</view>
 
 	<view class="content">
-		<view class="content-item">
+		<view class="content-item" wx:if="{{description}}">
 			<view class="content-item-name">需求描述</view>
 			<view class="content-item-text">
 				<text>{{description}}</text>
 			</view>
 		</view>
-		<view class="content-item">
+		<view class="content-item" wx:if="{{qualification}}">
 			<view class="content-item-name">资质要求</view>
 			<view class="content-item-text">
 				<text>{{qualification}}</text>
 			</view>
 		</view>
 
-		<view class="content-item">
+		<view class="content-item" wx:if="{{acceptanceCriteria}}">
 			<view class="content-item-name">验收标准</view>
 			<view class="content-item-text">
 				<text>{{acceptanceCriteria}}</text>
@@ -180,12 +180,14 @@
 		</view>
 	</view>
 	<view class="button safe-area-bottom">
-		<block wx:if="status === 1">
+		<block wx:if="{{status === 1}}">
 			<view class="button-content" bindtap="apply" wx:if="{{!displayCancel&&needEnrollment}}">我要报名</view>
 		</block>
-		<block wx:if="status===2">
+		<block wx:if="{{status===2}}">
 			<view class="button-content" bindtap="buttonSubmit" wx:if="{{hwOrderAPI.status === 0}}">确认签署</view>
-			<view class="button-content disabled" wx:if="{{hwOrderAPI.status !==0}}">企业确认中</view>
+			<view class="button-content disabled" wx:if="{{hwOrderAPI.status ===5}}">企业确认中</view>
+			<view class="button-content disabled" wx:if="{{hwOrderAPI.status === 2}}">订单进行中</view>
+			<view class="button-content disabled" wx:if="{{hwOrderAPI.status === 1}}">订单已完成</view>
 		</block>
 	</view>
 </view>

miniprogram/pages/detail/detail.wxss

@@ -436,7 +436,7 @@ page {
 
 .content {
   width: 710rpx;
-  min-height: 820rpx;
+  /* min-height: 820rpx; */
   background: #ffffff;
   border-radius: 18rpx;
   border: 2rpx solid #ebebec;
@@ -457,7 +457,7 @@ page {
 }
 
 .content-item-text {
-  font-size: 28epx;
+  font-size: 28rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: rgba(0, 0, 0, 0.65);
@@ -466,7 +466,7 @@ page {
 .button {
   width: 100%;
   position: fixed;
-  bottom: 0;
+  bottom: 15rpx;
   left: 0;
   display: flex;
   align-items: center;

miniprogram/pages/index/index.ts

@@ -1,6 +1,6 @@
 //index.js
 //获取应用实例
-import { getRequirementsApi, } from "../../service/hwRequirement";
+import { getRequirementsImpl, } from "../../service/impl/hwRequirement.impl";
 import { bannerApi } from "../../service/hwUser";
 const app = getApp()
 let cover_animation: any = {}
@@ -282,14 +282,12 @@ Page({
      */
     getList(pageNo?: number, province_code?: number, city_code?: number, country_code?: number, trade_type?: number, priceType?: number) {
         let _pageNo: number = pageNo || this.data.pageNo
+        let platform_id = 1
+        const userInfo = wx.getStorageSync('userInfo')
+        if (userInfo) {
+            platform_id = userInfo.platformId
+        }
         const param = Object.assign({
-            pageNo: _pageNo,
-            province_code: this.data.province_id,
-            city_code: this.data.city_id,
-            country_code: this.data.area_id,
-            trade_type: this.data.industry_id,
-            priceType: this.data.price_id
-        }, {
             pageNo,
             pageSize: 10,
             province_code,
@@ -297,9 +295,18 @@ Page({
             country_code,
             trade_type,
             priceType,
-            platform_id: app.globalData.platformId
+            platform_id
+        }, {
+            pageNo: _pageNo,
+            province_code: this.data.province_id,
+            city_code: this.data.city_id,
+            country_code: this.data.area_id,
+            trade_type: this.data.industry_id,
+            priceType: this.data.price_id
         })
-        getRequirementsApi(param).then(res => {
+        getRequirementsImpl(param).then(res => {
+            console.log('res=>', res);
+
             if (typeof res === 'string') {
                 // 如果没有网络  展示网络故障界面
                 if (res === 'offline' && this.data.list.length === 0) {
@@ -310,27 +317,31 @@ Page({
                     })
                 }
             }
-            const data = <responseOptionsType>res
-            if (data.errcode === 0) {
-                if (pageNo === 1 && data.data.requirements.length === 0) {
-                    // this.doAnimation(false);
+            if (<responseOptionsType>res) {
+                const data = <responseOptionsType>res
+                if (data.errCode === 0) {
+
+
+                    if (_pageNo === 1 && data.data.requirements.length === 0) {
+                        // this.doAnimation(false);
+                        this.setData({
+                            loading: false,
+                            list_length: true,
+                            offline: false
+                        })
+                        return
+                    }
+                    // 在成功后页数加一方便日后调用
+                    _pageNo++;
                     this.setData({
-                        loading: false,
-                        list_length: true,
-                        offline: false
+                        pageNo: _pageNo,
+                        [`list[${_pageNo - 2}]`]: data.data.requirements,
+                        isLast: data.data.isLast,
+                        offline: false,
+                        list_length: false,
+                        loading: false
                     })
-                    return
                 }
-                // 在成功后页数加一方便日后调用
-                _pageNo++;
-                this.setData({
-                    pageNo: _pageNo,
-                    [`list[${_pageNo - 2}]`]: data.data.requirements,
-                    isLast: data.data.isLast,
-                    offline: false,
-                    list_length: false,
-                    loading: false
-                })
             }
         }).catch(() => {
             this.setData({
@@ -346,7 +357,7 @@ Page({
     getBanner() {
         bannerApi().then(res => {
             const data = <responseOptionsType>res
-            if (data.errcode === 0) {
+            if (data.errCode === 0) {
                 this.setData({
                     swiper: data.data.bannerList
                 })

miniprogram/pages/index/index.wxml

@@ -6,10 +6,10 @@
   <!-- 轮播及条件筛选开始 -->
   <view class="block">
     <!-- 页面标题 -->
-    <view class="block-title" bindtap="toPerson">
-      <!-- <text>需求大厅</text> -->
+    <!-- <view class="block-title" bindtap="toPerson">
+      <text>需求大厅</text>
       <image src="/images/icon/person.png"></image>
-    </view>
+    </view> -->
     <!-- 页面标题结束 -->
     <view class="swiper-group">
       <swiper class="swiper" indicator-color='#fff' indicator-active-color="#fff" autoplay='{{autoplay}}'
@@ -18,10 +18,10 @@
           <image src="{{item}}"></image>
         </swiper-item>
       </swiper>
-      <view class="dot">
+      <!-- <view class="dot">
         <view class="dot-list {{swiperIndex === index?'dot-list-activated':''}}" wx:for='{{swiper}}' wx:key="index">
         </view>
-      </view>
+      </view> -->
     </view>
 
     <!-- 条件筛选开始 -->

miniprogram/pages/index/index.wxss

@@ -5,7 +5,7 @@ page {
 }
 
 .container {
-  margin-bottom: 110rpx;
+  margin-bottom: 165rpx;
   position: relative;
   top: 0;
   transition: all 500ms ease 0ms;

miniprogram/pages/login/login.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "登录/注册",
+  "navigationStyle":"custom",
   "usingComponents": {}
 }

miniprogram/pages/login/login.ts

@@ -147,7 +147,7 @@ Page({
     clearTimeout(codeInter);
     codeInter = setTimeout(_ => {
       this.setData({
-        canLogin: Boolean(app.globalData.phone_zz.test(value) && this.data.code && this.data.isCheck),
+        canLogin: Boolean(app.globalData.phone_zz.test(this.data.phone) && value && this.data.isCheck),
         code: value
       })
     }, interval)
@@ -178,7 +178,19 @@ Page({
                 data: res.data.userInfo.userToken,
                 success: () => {
                   wx.setStorageSync('userInfo', res.data.userInfo)
+                  if (!wx.getStorageInfoSync().keys.length) {
+                    wx.setStorageSync('hasClear', true)
+                  }
                   // 提交是否登录信息
+                  if (res.data.userInfo.isDemonstrate) {
+                    wx.reLaunch({
+                      url: '/pages/index/index'
+                    })
+                  } else {
+                    wx.reLaunch({
+                      url: '/pages/my-order/my-order'
+                    })
+                  }
                 }
               })
             }
@@ -186,9 +198,19 @@ Page({
         }
       })
     } else {
+      let content = ''
+      if (!this.data.isCheck) {
+        content = '请勾选用用户协议与隐私政策'
+      }
+      if (!this.data.code) {
+        content = '请填写验证码'
+      }
+      if (!this.data.phone || !app.globalData.phone_zz.test(this.data.phone)) {
+        content = '电话号码格式错误'
+      }
       wx.showModal({
         title: '登录失败',
-        content: '电话号码格式错误',
+        content,
         showCancel: false,
         confirmColor: '#31364C',
       })
@@ -212,6 +234,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    wx.hideHomeButton();
     const captchaResult = app.globalData.captchaResult;
     console.log(captchaResult);
     if (captchaResult && captchaResult.ret === 0) {

miniprogram/pages/login/login.wxss

@@ -28,7 +28,6 @@ page {
 }
 
 .content {
-
   padding: 0 64rpx;
 }
 
@@ -38,7 +37,6 @@ page {
   margin-left: 2rpx;
 }
 
-
 .title {
   font-size: 48rpx;
   font-family: PingFangSC-Medium, PingFang SC;
@@ -130,7 +128,7 @@ text.color {
   font-size: 26rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #000000;
+  color: rgba(0, 0, 0, 0.45);
   position: absolute;
   left: 0;
   bottom: 0;
@@ -147,14 +145,14 @@ text.color {
   border-radius: 18rpx;
   line-height: 102rpx;
   text-align: center;
-  background: #D9D9D9;
+  background: #d9d9d9;
   font-size: 38rpx;
   font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
-  color: #FFFFFF;
+  color: #ffffff;
   margin-bottom: 20rpx;
 }
 
 .bottom .button-login {
-  background: #1890FF;
-}
+  background: #1890ff;
+}

miniprogram/pages/my-order/my-order.wxml

@@ -8,10 +8,10 @@
       <text>待签署</text>
       <view>{{listNumber}}</view>
     </view>
-    <view class="header-item {{status === 1?'item-activated':''}}" data-index="1" bindtap="changeSelect">
+    <view class="header-item {{status === 2?'item-activated':''}}" data-index="2" bindtap="changeSelect">
       <text>进行中</text>
     </view>
-    <view class="header-item {{status === 2?'item-activated':''}}" data-index="2" bindtap="changeSelect">
+    <view class="header-item {{status === 1?'item-activated':''}}" data-index="1" bindtap="changeSelect">
       <text>已完成</text>
     </view>
   </view>
@@ -25,7 +25,7 @@
               <text>{{item.hwRequirement.name}}</text>
               <text class="price">{{item.hwRequirement.price}}元</text>
             </view>
-            <view class="content-company">{{item.hwRequirement.companyName}}</view>
+            <view class="content-company">{{item.hwPlatformCompany.companyName || ''}}</view>
             <view class="content-info">
               <view class="address">
                 <image src="../../imgs/address.png" class="address-image"></image>

miniprogram/pages/my-order/my-order.wxss

@@ -2,7 +2,7 @@
 
 page {
   height: 100%;
-  background: #F0F1F2;
+  background: #f0f1f2;
 }
 
 .container {
@@ -16,7 +16,7 @@ page {
 .header {
   width: 750rpx;
   height: 112rpx;
-  background: #1890FF;
+  background: #1890ff;
   font-size: 32rpx;
   font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
@@ -37,10 +37,10 @@ page {
   font-size: 24rpx;
   font-family: Helvetica-Bold, Helvetica;
   font-weight: bold;
-  color: #FFFFFF;
-  background: #FA541C;
+  color: #ffffff;
+  background: #fa541c;
   border-radius: 50%;
-  background: #FA541C;
+  background: #fa541c;
   position: absolute;
   right: -10rpx;
   top: -10rpx;
@@ -50,15 +50,15 @@ page {
   font-size: 38rpx;
   font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
-  color: #FFFFFF;
+  color: #ffffff;
   position: relative;
 }
 
 .item-activated::after {
-  content: '';
+  content: "";
   width: 88rpx;
   height: 6rpx;
-  background: #FFFFFF;
+  background: #ffffff;
   border-radius: 3rpx;
   position: absolute;
   left: 50%;
@@ -85,7 +85,7 @@ page {
 
 .content {
   min-height: 253rpx;
-  background: #FFFFFF;
+  /* background: #ffffff; */
   padding: 40rpx 24rpx;
   box-sizing: border-box;
 }
@@ -101,7 +101,7 @@ page {
 }
 
 .price {
-  color: #096DD9;
+  color: #096dd9;
 }
 
 .content-company {
@@ -124,11 +124,13 @@ page {
 
 .address {
   min-height: 48rpx;
-  background: #F5F5F5;
+  background: #f5f5f5;
   border-radius: 18rpx;
   padding: 12rpx 16rpx;
   box-sizing: border-box;
   margin-right: 16rpx;
+  display: flex;
+  align-items: center;
 }
 
 .address-image {
@@ -139,10 +141,12 @@ page {
 
 .number {
   min-height: 48rpx;
-  background: #F5F5F5;
+  background: #f5f5f5;
   border-radius: 8rpx;
   padding: 12rpx 16rpx;
   box-sizing: border-box;
+  display: flex;
+  align-items: center;
 }
 
 .number-image {
@@ -158,7 +162,7 @@ page {
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: rgba(0, 0, 0, 0.65);
-  background: #FFFFFF;
+  /* background: #ffffff; */
   border-top: 2rpx solid rgba(235, 235, 236, 0.8);
   padding: 20rpx 24rpx;
   box-sizing: border-box;
@@ -175,8 +179,8 @@ page {
   font-size: 28rpx;
   font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
-  color: #FFFFFF;
-  background: #1890FF;
+  color: #ffffff;
+  background: #1890ff;
   border-radius: 29rpx;
 }
 
@@ -225,8 +229,8 @@ page {
   font-size: 28rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #FFFFFF;
+  color: #ffffff;
   background: rgba(0, 0, 0, 0.25);
   border-radius: 29rpx;
   margin-top: 100rpx;
-}
+}

miniprogram/pages/payment-records-detail/payment-records-detail.wxml

@@ -62,7 +62,7 @@
       <text>收款时间</text>
     </view>
     <view class="right">
-      <text>{{createTime}}</text>
+      <text>{{paymentResultTime}}</text>
     </view>
   </view>
 

miniprogram/pages/payment-records/payment-records.wxml

@@ -5,7 +5,7 @@
     <navigator url="/pages/payment-records-detail/payment-records-detail?id={{item.id}}" class="cell" hover-class="none" wx:for='{{item}}' wx:key="index">
       <view class="left">
         <text class="order-nums">{{item.orderNumber}}</text>
-        <text class="time">{{item.createTime}}</text>
+        <text class="time">{{item.paymentResultTime}}</text>
       </view>
       <view class="right">
         <text>￥{{tool.formatMoney(item.netPayment)}}</text>

miniprogram/pages/person/person.wxml

@@ -67,15 +67,15 @@
   <view class="user-info" bindtap="toUserinfo">
     <view class="info">
       <view class="avatar">
-        <image src="{{userinfo.avatar}}" wx:if="{{userinfo.avatar}}"></image>
+        <image src="{{userInfo.avatar}}" wx:if="{{userInfo.avatar}}"></image>
         <image src="/images/icon/avatar.png" wx:else></image>
       </view>
       <view class="info-detail">
-        <view class="name" wx:if="{{userinfo.name}}">{{userinfo.name}}</view>
+        <view class="name" wx:if="{{userInfo.name}}">{{userInfo.name}}</view>
         <open-data type="userNickName" wx:else class="name"></open-data>
-        <view class="sign">
-          <image src="../../imgs/sigin.png"></image>
-          <text>已认证</text>
+        <view class="sign {{authenticationStatus !==1&&'no-sign'}}">
+          <image src="{{authenticationStatus===1?'../../imgs/sigin.png':'../../imgs/no-sigin.png'}}"></image>
+          <text>{{userInfo.authenticationStatus===0?'未认证':userInfo.authenticationStatus===1?"已认证":"认证不通过"}}</text>
         </view>
       </view>
     </view>
@@ -85,14 +85,14 @@
   <view class="group-list">
     <navigator class="group-item" url="/pages/payment-records/payment-records" hover-class="none">
       <view class="group-item-content">
-        <image src="../../imgs/sigin.png"></image>
+        <image src="../../imgs/records.png"></image>
         <text>收款记录</text>
       </view>
       <image src="/images/icon/right.png" class="right"></image>
     </navigator>
     <navigator class="group-item" url="/pages/tax-certificate/tax-certificate" hover-class="none">
       <view class="group-item-content">
-        <image src="../../imgs/sigin.png"></image>
+        <image src="../../imgs/tax.png"></image>
         <text>完税证明</text>
       </view>
       <image src="/images/icon/right.png" class="right"></image>
@@ -101,7 +101,7 @@
   <view class="group-list">
     <navigator class="group-item" url="/pages/common-setting/common-setting" hover-class="none">
       <view class="group-item-content">
-        <image src="../../imgs/sigin.png"></image>
+        <image src="../../imgs/more.png"></image>
         <text>更多</text>
       </view>
       <image src="/images/icon/right.png" class="right"></image>

miniprogram/pages/person/person.wxss

@@ -1,7 +1,7 @@
 /* pages/person/person.wxss */
 
 page {
-  background: #F0F1F2;
+  background: #f0f1f2;
 }
 
 .container {
@@ -88,12 +88,13 @@ page {
 .user-info {
   width: 750rpx;
   height: 232rpx;
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 52rpx 40rpx;
   box-sizing: border-box;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  margin-bottom: 1rpx;
 }
 
 .info {
@@ -110,6 +111,7 @@ page {
 .avatar image {
   height: 100%;
   width: 100%;
+  border-radius: 8rpx;
 }
 
 .info-detail {
@@ -132,12 +134,12 @@ page {
 .sign {
   width: 152rpx;
   height: 48rpx;
-  background: #E6F7FF;
+  background: #e6f7ff;
   border-radius: 24px;
   font-size: 24rpx;
   font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
-  color: #1890FF;
+  color: #1890ff;
   padding: 0 24rpx;
   box-sizing: border-box;
   display: flex;
@@ -145,6 +147,11 @@ page {
   justify-content: space-between;
 }
 
+view.no-sign {
+  background: #f3f3f3;
+  color: rgba(0, 0, 0, 0.25);
+}
+
 .sign image {
   height: 24rpx;
   width: 21rpx;
@@ -159,10 +166,11 @@ page {
   height: 112rpx;
   padding: 37rpx 37rpx 37rpx 43rpx;
   box-sizing: border-box;
-  background: #FFFFFF;
+  background: #ffffff;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  margin-bottom: 1rpx;
 }
 
 .group-item-content {
@@ -175,7 +183,7 @@ page {
 }
 
 .group-item-content image {
-  width: 42rpx;
-  height: 38rpx;
+  width: 48rpx;
+  height: 48rpx;
   margin-right: 35rpx;
-}
+}

miniprogram/pages/version/version.wxss

@@ -24,7 +24,7 @@
   justify-content: center;
   position: fixed;
   left: 0;
-  bottom: 0;
+  bottom: 15rpx;
 }
 
 .button view {

miniprogram/service/hwOrder.ts

@@ -32,7 +32,7 @@ export const confirmOrderApi = (data: confirmOrderDatatype): Promise<responesOpt
  */
 export const confirmECOrdersApi = (data: confirmOrderDatatype): Promise<responesOptions> => {
 	const options: requestOptionsType<any> = {
-		url: api.hwOrder.confirmOrder,
+		url: api.hwOrder.confirmECOrders,
 		data,
 		type: 'post'
 	}
@@ -47,7 +47,6 @@ export const getOrderDetailApi = (data: getOrderDetailDataType): Promise<respone
 	const options: requestOptionsType<any> = {
 		url: api.hwOrder.getOrderDetail,
 		data,
-		type: 'post'
 	}
 	return $request(options)
 }

miniprogram/service/hwRequirement.ts

@@ -8,18 +8,9 @@
  */
 import api from "../api/api";
 import { $request } from "../utils/request";
-interface getRequirementsData {
-  pageNo: number
-  pageSize: number
-  province_code: number
-  city_code: number
-  country_code: number
-  trade_type: number
-  priceType: number
-  platform_id: number
-}
+
 /**
- * 获取需求详情
+ * 获取需求列表
  * @param data 
  */
 export const getRequirementsApi = (data: getRequirementsData): Promise<responesOptions> => {

miniprogram/service/hwUser.ts

@@ -42,7 +42,8 @@ export const getAuthCodeApi = (data: getAuthCodeDataType): Promise<responesOptio
 export const phoneLoginApi = (data: phoneLoginDataType): Promise<responesOptions> => {
   const options: requestOptionsType<any> = {
     url: api.hwuser.phoneLogin,
-    data
+    data,
+    type: 'post'
   }
   return $request(options)
 }

miniprogram/service/impl/hwOrder.impl.ts

@@ -1,4 +1,4 @@
-import { confirmOrderApi, getOrderDetailApi, getOrdersApi } from "../hwOrder";
+import { confirmECOrdersApi, confirmOrderApi, getOrderDetailApi, getOrdersApi } from "../hwOrder";
 
 /**
  * 获取我的订单列表
@@ -24,7 +24,7 @@ export const confirmOrderImpl = (parma: confirmOrderDatatype) => confirmOrderApi
  * 确认电子合同订单
  * @param parma 
  */
-export const confirmECOrdersImpl = (parma: confirmOrderDatatype) => confirmOrderApi(parma).then(res => {
+export const confirmECOrdersImpl = (parma: confirmOrderDatatype) => confirmECOrdersApi(parma).then(res => {
 	const data = (<responseOptionsType>res)
 	return data
 })

miniprogram/service/impl/hwRequirement.impl.ts

@@ -1,4 +1,4 @@
-import { cancelEnrollmentApi, enrollmentRequireApi, getRequirementDetailApi } from "../hwRequirement";
+import { cancelEnrollmentApi, enrollmentRequireApi, getRequirementDetailApi, getRequirementsApi } from "../hwRequirement";
 
 /**
  * 报名需求
@@ -18,6 +18,15 @@ export const cancelEnrollmentImpl = (parma: cancelEnrollmentDataType) => cancelE
 })
 
 /**
+ * 获取需求列表
+ * @param param 
+ */
+export const getRequirementsImpl = (param: getRequirementsData) => getRequirementsApi(param).then(res => {
+	const data = (<responseOptionsType>res)
+	return data
+})
+
+/**
  * 获取需求详情
  * @param param 
  */

miniprogram/service/service.d.ts

@@ -59,3 +59,14 @@ type getRequirementDetailDataType = {
 	user_token: Number;
 	hwRequirementId: Number;
 };
+
+interface getRequirementsData {
+  pageNo: number
+  pageSize: number
+  province_code?: number
+  city_code?: number
+  country_code?: number
+  trade_type?: number
+  priceType?: number
+  platform_id?: number
+}

miniprogram/utils/request.ts

@@ -84,6 +84,7 @@ async function formatOption(options: any): Promise<any> {
     /* 设置userID和usertoken */
     options.data = await getUserId(options.data);
     /** 当user_id与user_token不全时 提示登陆重新获取 */
+    console.log('options=>', options);
     if (options.data.user_id && options.data.user_token) {
       return options;
     } else {

miniprogram/utils/util.ts

@@ -20,7 +20,7 @@ export function login(message: string = '你还未登录，请立即登录') {
     confirmColor: '#31364C',
     success: res => {
       if (res.confirm) {
-        wx.navigateTo({
+        wx.reLaunch({
           url: '/pages/login/login',
         })
       }