wangxin 4 年 前
コミット
4ab943e635

+ 16 - 10
app.json

@@ -59,21 +59,27 @@
     "pages/jinali-info/index",
     "pages/interview-registration/index",
     "pages/payment-details/payment-details",
-    "pages/integral/pages/integral/integral",
-    "pages/integral/pages/task/task",
-    "pages/integral/pages/integral-rule/integral-rule",
-    "pages/integral/pages/gift/gift",
-    "pages/integral/pages/gift-detail/gift-detail",
-    "pages/integral/pages/exchange-record/exchange-record",
-    "pages/integral/pages/exchange-detail/exchange-detail",
-    "pages/integral/pages/integral-pay/integral-pay",
+    "pages/integral/integral/integral",
     "pages/clock/clock",
     "pages/clock/clock-success/clock-success",
     "pages/clock/clock-rule/clock-rule",
     "pages/clock/clock-tongji/index",
     "pages/clock/clock-tongji/list"
   ],
-  "subpackages": [{
+  "subpackages": [
+    {
+      "root": "pages/integral/pages",
+      "pages": [
+        "task/task",
+        "integral-rule/integral-rule",
+        "gift/gift",
+        "gift-detail/gift-detail",
+        "exchange-record/exchange-record",
+        "exchange-detail/exchange-detail",
+        "integral-pay/integral-pay"
+      ]
+    },
+    {
       "root": "pages/expense",
       "pages": [
         "pages/wages/index",
@@ -124,7 +130,7 @@
         "selectedIconPath": "/images/tabs/clock1.png"
       },
       {
-        "pagePath": "pages/integral/pages/integral/integral",
+        "pagePath": "pages/integral/integral/integral",
         "text": "积分",
         "iconPath": "/images/tabs/integral.png",
         "selectedIconPath": "/images/tabs/integral1.png"

+ 10 - 10
config/config.js

@@ -1,15 +1,15 @@
 // 测试服
-// const apiUrl = "https://kf.hap-job.com/happyjob"
-// const rootUrl = "https://kf.hap-job.com"
-// const imgServerUrl = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina"//静态资源图片服务器地址
-// const imgServerUrl_new = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com"//图片服务器地址
-// const captcha = '2078399419'
+const apiUrl = "https://kf.hap-job.com/happyjob"
+const rootUrl = "https://kf.hap-job.com"
+const imgServerUrl = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina"//静态资源图片服务器地址
+const imgServerUrl_new = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com"//图片服务器地址
+const captcha = '2078399419'
 // 正式服
-const apiUrl = "https://web.hap-job.com/happyjob"
-const rootUrl = "https://web.hap-job.com"
-const imgServerUrl = "https://happyjob.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina" //图片服务器地址
-const imgServerUrl_new = "https://happyjob.oss-cn-shanghai.aliyuncs.com" //图片服务器地址
-const captcha = '2019232819'
+// const apiUrl = "https://web.hap-job.com/happyjob"
+// const rootUrl = "https://web.hap-job.com"
+// const imgServerUrl = "https://happyjob.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina" //图片服务器地址
+// const imgServerUrl_new = "https://happyjob.oss-cn-shanghai.aliyuncs.com" //图片服务器地址
+// const captcha = '2019232819'
 
 module.exports = {
   apiUrl,

+ 1 - 1
pages/integral/pages/integral/integral.js

@@ -4,7 +4,7 @@ import {
   todaySign,
   todaySupSign,
   getReward
-} from '../../../../services/index.js';
+} from '../../../services/index.js';
 const params = {
   user_id: wx.getStorageSync('user_id'),
   user_token: wx.getStorageSync('user_token'),

pages/integral/pages/integral/integral.json → pages/integral/integral/integral.json


+ 8 - 8
pages/integral/pages/integral/integral.wxml

@@ -1,10 +1,10 @@
 <!--pages/integral/integral.wxml-->
-<wxs src="../../../tools.wxs" module="globalTools" />
+<wxs src="../../tools.wxs" module="globalTools" />
 
 <view class="container">
 
   <view class="header">
-    <image class="header-bg" src="../../images/sign_background.jpeg"></image>
+    <image class="header-bg" src="../images/sign_background.jpeg"></image>
     <view class="header-content">
       <view class="score">
         <text class="fen">{{mpMemberAccount.pointsBalance || 0}}</text>
@@ -17,10 +17,10 @@
     <view class="title">
       <view class="title-left">
         <text>每周签到</text>
-        <image class="rule" src="../../images/sign_rule.png" data-type="dec" bindtap="checkRule"></image>
+        <image class="rule" src="../images/sign_rule.png" data-type="dec" bindtap="checkRule"></image>
       </view>
       <navigator class="more-integral" url="/pages/integral/pages/task/task" hover-class="none">
-        <image class="sign_icon" src="../../images/sign_icon.png"></image>
+        <image class="sign_icon" src="../images/sign_icon.png"></image>
         <text>赚更多积分</text>
       </navigator>
     </view>
@@ -28,14 +28,14 @@
     <view class="sign-list">
       <view class="sign-btn" wx:for='{{sign_list}}' wx:key='index'>
         <view class="sign-icon">
-          <image src="{{mpMemberSigninList[index]?'../../images/sign_success.png':noSign!==0&&mpMemberSigninList.length === index&&isSign&&!isSupSign?'../../images/sign_wait.png':'../../images/sign_no.png'}}" mode="widthFix" class="sign_icon_img"></image>
+          <image src="{{mpMemberSigninList[index]?'../images/sign_success.png':noSign!==0&&mpMemberSigninList.length === index&&isSign&&!isSupSign?'../images/sign_wait.png':'../images/sign_no.png'}}" mode="widthFix" class="sign_icon_img"></image>
           <view class="sign-bar {{mpMemberSigninList[index]?'bar-action':noSign!==0&&mpMemberSigninList.length === index&&isSign&&!isSupSign?'bar-wait':''}}"></view>
         </view>
         <view class="text">第{{index + 1}}天</view>
       </view>
     </view>
     <view class="sign-button" bindtap="sign">
-      <image class="sign-button-image" src=" {{(isSign&&isSupSign) || (isSign&&!isSupSign&&!supplementarySignin)?'../../images/sign_button_grey.png':'../../images/sign_button.png'}} "></image>
+      <image class="sign-button-image" src=" {{(isSign&&isSupSign) || (isSign&&!isSupSign&&!supplementarySignin)?'../images/sign_button_grey.png':'../images/sign_button.png'}} "></image>
       <view class="sian-button-content">
         <text wx:if='{{!isSign&&!isSupSign}}'>本周已签到{{mpMemberSigninList.length || 0}}天,点击继续签到</text>
         <text wx:if='{{isSign&&!isSupSign&&noSign>=1}}'>您已签到{{mpMemberSigninList.length || 0}}天,点击可补签1次</text>
@@ -49,8 +49,8 @@
       <view class="gift-title-right" data-type="rule" bindtap="checkRule">积分规则 ></view>
     </view>
     <view class="gift-content">
-      <image src="../../images/gift.png" data-type="gift" bindtap="toPage"></image>
-      <image src="../../images/activity.png" data-type="activity" bindtap="toPage"></image>
+      <image src="../images/gift.png" data-type="gift" bindtap="toPage"></image>
+      <image src="../images/activity.png" data-type="activity" bindtap="toPage"></image>
     </view>
   </view>
   <view class="integral">

pages/integral/pages/integral/integral.wxss → pages/integral/integral/integral.wxss


+ 4 - 5
project.config.json

@@ -39,17 +39,16 @@
       "outputPath": ""
     },
     "enableEngineNative": false,
-    "useIsolateContext": false,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": true,
+    "useIsolateContext": true,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.11.2",
-  "appid": "wx1e8ed93850777ffb",
+  "appid": "wx5ae6908ae55edcb7",
   "projectname": "kaixin",
   "debugOptions": {
     "hidedInDevtools": []

+ 1 - 2
project.private.config.json

@@ -292,10 +292,9 @@
           "scene": null
         },
         {
-          "id": 40,
           "name": "面试登记",
           "pathName": "pages/interview-registration/index",
-          "query": "url=http://192.168.19.118:8082/interview/xiapu&&registerCompanyId=1",
+          "query": "url=https://dk.hap-job.com/interview/xiapu&&registerCompanyId=1",
           "scene": null
         },
         {