wangxin 4 år sedan
förälder
incheckning
34f949e734
7 ändrade filer med 19 tillägg och 19 borttagningar
  1. BIN
      .DS_Store
  2. 1 1
      app.js
  3. 3 3
      pages/detail/detail.js
  4. 3 3
      pages/index/index.wxml
  5. 3 3
      pages/my-order/my-order.js
  6. 1 1
      pages/my-order/my-order.wxml
  7. 8 8
      project.config.json

BIN
.DS_Store


+ 1 - 1
app.js

@@ -88,7 +88,7 @@ App({
     userInfo: null,
     phone_zz: /1[0-9]{10}/,
     webview: null,
-    version: '1.1.6',
+    version: '1.2.1',
     platformId: 1
   },
   /**

+ 3 - 3
pages/detail/detail.js

@@ -211,9 +211,9 @@ Page({
    * 前台报名需求后  后台生成订单   需前台手动确定订单 根据订单合同不同调用不同接口
    */
   buttonSubmit() {
-    const contractType = this.data.hwOrderAPI.contractType;
+    const workContractType = this.data.hwOrderAPI.workContractType;
     // 电子合同确认订单
-    if (contractType === 2) {
+    if (workContractType === 1) {
       wx.kx_request({
         url: wx.kx_api.hwOrder.confirmECOrders,
         type: 'post',
@@ -237,7 +237,7 @@ Page({
       })
     }
     // 非电子合同
-    if (contractType === 1 || contractType === 0) {
+    if (workContractType === 0) {
       wx.kx_request({
         url: wx.kx_api.hwOrder.confirmOrder,
         type: 'post',

+ 3 - 3
pages/index/index.wxml

@@ -56,9 +56,9 @@
         <view class="top">
           <view class="name global-family">{{item.name}}</view>
           <text class="payment">
-          <text>{{item.price}}元*</text>
-          <text wx:if='{{item.settlementMethod===1 }}'>{{item.stage || 0}}期</text>
-          <text wx:if='{{item.settlementMethod===0 }}'>1次</text>
+          <text>{{item.price}}元</text>
+          <text wx:if='{{item.settlementMethod===1 }}'>*{{item.stage || 0}}期</text>
+          <text wx:if='{{item.settlementMethod===0 }}'>*1次</text>
           </text>
         </view>
         <view class="midden">

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

@@ -48,10 +48,10 @@ Page({
   confirm(e) {
     const id = e.currentTarget.dataset.id;
     const index = e.currentTarget.dataset.index;
-    const contracttype = e.currentTarget.dataset.contracttype;
+    const workContractType = e.currentTarget.dataset.workcontracttype;
     const parentindex = e.currentTarget.dataset.parentindex;
     // 电子合同确认
-    if (contracttype === 2) {
+    if (workContractType === 1) {
       wx.kx_request({
         url: wx.kx_api.hwOrder.confirmECOrders,
         type: 'post',
@@ -74,7 +74,7 @@ Page({
       })
     }
     // 非电子合同确认
-    if (contracttype === 1 || contracttype === 0) {
+    if (workContractType === 0) {
       wx.kx_request({
         url: wx.kx_api.hwOrder.confirmOrder,
         type: 'post',

+ 1 - 1
pages/my-order/my-order.wxml

@@ -29,7 +29,7 @@
       </view>
       <view class="action" wx:if='{{item.status === 0}}'>
         <view class="contract" wx:if='{{item.workContract}}' data-contract="{{item.workContract}}" catchtap="checkContract">查看合同</view>
-        <view class="order" data-id="{{item.id}}" data-parentIndex="{{key}}" data-index="{{index}}" data-contractType="{{item.contractType}}" catchtap="confirm">确认订单</view>
+        <view class="order" data-id="{{item.id}}" data-parentIndex="{{key}}" data-index="{{index}}" data-workContractType="{{item.workContractType}}" catchtap="confirm">确认订单</view>
       </view>
     </view>
   </block>

+ 8 - 8
project.config.json

@@ -12,6 +12,7 @@
     "minified": true,
     "newFeature": true,
     "coverView": true,
+    "nodeModules": false,
     "autoAudits": true,
     "showShadowRootInWxmlPanel": true,
     "scopeDataCheck": false,
@@ -20,19 +21,23 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "useMultiFrameRuntime": false,
+    "useMultiFrameRuntime": true,
     "useApiHook": true,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "bundle": true,
+    "enableEngineNative": false,
+    "bundle": false,
     "useIsolateContext": true,
     "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": true,
+    "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
-    "packNpmRelationList": []
+    "packNpmRelationList": [],
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.7.7",
@@ -46,15 +51,12 @@
   "simulatorPluginLibVersion": {},
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "plugin": {
-      "current": -1,
       "list": []
     },
     "game": {
@@ -62,11 +64,9 @@
       "list": []
     },
     "gamePlugin": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": -1,
       "list": [
         {
           "id": 0,