* 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-customer: fix:更新 # Conflicts: # .env.development # ci/project.config.json # dist/build/mp-weixin/INDEX/bill/list/index.wxml # dist/build/mp-weixin/INDEX/invitation/index.js # dist/build/mp-weixin/INDEX/invitation/index.json # dist/build/mp-weixin/INDEX/invitation/index.wxml # dist/build/mp-weixin/INDEX/invitation/index.wxss # dist/build/mp-weixin/INDEX/parking_payment/index.js # dist/build/mp-weixin/INDEX/parking_payment/index.wxml # dist/build/mp-weixin/INDEX/parking_payment/index.wxss # dist/build/mp-weixin/INDEX/parking_payment_record/index.js # dist/build/mp-weixin/INDEX/parking_payment_record/index.json # dist/build/mp-weixin/INDEX/parking_payment_record/index.wxml # dist/build/mp-weixin/INDEX/parking_payment_record/index.wxss # dist/build/mp-weixin/INDEX/pay/method.js # dist/build/mp-weixin/INDEX/pay/success.js # dist/build/mp-weixin/INDEX/pay/success.wxml # dist/build/mp-weixin/INDEX/pay/success.wxss # dist/build/mp-weixin/ME/payment_pre_stored/index.js # dist/build/mp-weixin/ME/payment_pre_stored/index.wxml # dist/build/mp-weixin/ME/payment_pre_stored/index.wxss # dist/build/mp-weixin/ME/pre_stored_form/index.js # dist/build/mp-weixin/ME/pre_stored_form/index.wxml # dist/build/mp-weixin/ME/vehicle_management/add/index.js # dist/build/mp-weixin/ME/vehicle_management/add/index.wxml # dist/build/mp-weixin/ME/vehicle_management/add/index.wxss # dist/build/mp-weixin/WORKORDER/add/index.js # dist/build/mp-weixin/WORKORDER/add/index.json # dist/build/mp-weixin/WORKORDER/add/index.wxml # dist/build/mp-weixin/WORKORDER/add/method.js # dist/build/mp-weixin/WORKORDER/list/index.js # dist/build/mp-weixin/WORKORDER/list/index.wxml # dist/build/mp-weixin/WORKORDER/list/index.wxss # dist/build/mp-weixin/WORKORDER/show/index.js # dist/build/mp-weixin/WORKORDER/show/index.json # dist/build/mp-weixin/WORKORDER/show/index.wxml # dist/build/mp-weixin/WORKORDER/show/index.wxss # dist/build/mp-weixin/WORKORDER/show/method.js # dist/build/mp-weixin/WORKORDER/show/model.js # dist/build/mp-weixin/common/components/cc-scroll-loading/cc-scroll-loading.js # dist/build/mp-weixin/common/components/cc-scroll-loading/cc-scroll-loading.wxml # dist/build/mp-weixin/common/components/cc-scroll-loading/cc-scroll-loading.wxss # dist/build/mp-weixin/common/libraries/day.js # dist/build/mp-weixin/common/vendor.js # dist/build/mp-weixin/components/hs-button/hs-button.js # dist/build/mp-weixin/components/hs-button/hs-button.wxml # dist/build/mp-weixin/components/hs-button/hs-button.wxss # dist/build/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.js # dist/build/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.wxml # dist/build/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.wxss # dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.js # dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxml # dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxss # dist/build/mp-weixin/gen/Apis.js # dist/build/mp-weixin/gen/Enums.js # dist/build/mp-weixin/node-modules/uview-plus/components/u-keyboard/u-keyboard.js # dist/build/mp-weixin/pages/index/components/Classification.js # dist/build/mp-weixin/pages/index/components/Classification.wxml # dist/build/mp-weixin/pages/index/components/Classification.wxss # dist/build/mp-weixin/pages/index/components/ConvenienceServices.js # dist/build/mp-weixin/pages/index/components/ConvenienceServices.json # dist/build/mp-weixin/pages/index/components/ConvenienceServices.wxml # dist/build/mp-weixin/pages/index/components/ConvenienceServices.wxss # dist/build/mp-weixin/pages/index/index.wxss # dist/build/mp-weixin/pages/me/components/AreaFunctional.js # dist/build/mp-weixin/pages/me/components/AreaFunctional.json # dist/build/mp-weixin/pages/me/components/AreaFunctional.wxml # dist/build/mp-weixin/pages/me/components/AreaFunctional.wxss # dist/build/mp-weixin/pages/transfer/index.js # dist/dev/mp-weixin/INDEX/pay/method.js # dist/dev/mp-weixin/INDEX/pay/success.wxml # dist/dev/mp-weixin/WORKORDER/add/index.js # dist/dev/mp-weixin/WORKORDER/list/index.js # dist/dev/mp-weixin/WORKORDER/list/index.json # dist/dev/mp-weixin/WORKORDER/list/index.wxml # dist/dev/mp-weixin/WORKORDER/list/index.wxss # dist/dev/mp-weixin/WORKORDER/show/index.js # dist/dev/mp-weixin/WORKORDER/show/index.json # dist/dev/mp-weixin/WORKORDER/show/index.wxml # dist/dev/mp-weixin/WORKORDER/show/index.wxss # dist/dev/mp-weixin/WORKORDER/show/model.js # dist/dev/mp-weixin/app.js # dist/dev/mp-weixin/common/libraries/day.js # dist/dev/mp-weixin/common/libraries/request.js # dist/dev/mp-weixin/common/vendor.js # dist/dev/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.js # dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.js # dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxss # dist/dev/mp-weixin/gen/Enums.js # dist/dev/mp-weixin/node-modules/uview-plus/components/u-keyboard/u-keyboard.js # dist/dev/mp-weixin/pages/transfer/index.js # dist/dev/mp-weixin/project.private.config.json # src/INDEX/pay/method.ts # src/INDEX/pay/success.vue # src/WORKORDER/add/index.vue # src/WORKORDER/list/index.vue # src/WORKORDER/list/style.scss # src/WORKORDER/show/index.vue # src/WORKORDER/show/model.ts # src/WORKORDER/show/style.scss # src/common/libraries/day.ts # src/components/hs-popup-evaluate/hs-popup-evaluate.vue # src/components/hs-reservation-picker/hs-reservation-picker.vue # src/gen/ApiTypes.d.ts # src/gen/Enums.ts # src/pages/transfer/index.vue
103 lines
2.8 KiB
JSON
103 lines
2.8 KiB
JSON
{
|
||
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
|
||
"condition": {
|
||
"miniprogram": {
|
||
"list": [
|
||
{
|
||
<<<<<<< HEAD
|
||
"name": "绑定",
|
||
"pathName": "INDEX/binding/index",
|
||
"query": "",
|
||
"scene": null,
|
||
"launchMode": "default"
|
||
=======
|
||
"name": "工单支付扫码",
|
||
"pathName": "pages/transfer/index",
|
||
"query": "scene=1_10",
|
||
"scene": 1011,
|
||
"launchMode": "default"
|
||
},
|
||
{
|
||
"name": "绑定",
|
||
"pathName": "INDEX/binding/index",
|
||
"query": "",
|
||
"launchMode": "default",
|
||
"scene": null
|
||
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|
||
},
|
||
{
|
||
"name": "转发",
|
||
"pathName": "pages/forward/index",
|
||
"query": "",
|
||
"launchMode": "default",
|
||
"scene": null
|
||
},
|
||
{
|
||
"name": "账单确认",
|
||
"pathName": "INDEX/bill_order/index",
|
||
"query": "bill_ids=[5,6]&house_id=1",
|
||
"launchMode": "default",
|
||
"scene": null
|
||
},
|
||
{
|
||
<<<<<<< HEAD
|
||
"name": "扫码",
|
||
"pathName": "pages/index/index",
|
||
"query": "",
|
||
"launchMode": "default",
|
||
"scene": 1011
|
||
},
|
||
{
|
||
=======
|
||
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|
||
"name": "支付成功",
|
||
"pathName": "INDEX/pay/success",
|
||
"query": "",
|
||
"launchMode": "default",
|
||
"scene": null
|
||
},
|
||
{
|
||
"name": "成功",
|
||
"pathName": "INDEX/binding/success",
|
||
"query": "",
|
||
"launchMode": "default",
|
||
"scene": null
|
||
},
|
||
{
|
||
"name": "绑定成功",
|
||
"pathName": "INDEX/binding/success",
|
||
"query": "",
|
||
"launchMode": "default",
|
||
"scene": null
|
||
},
|
||
{
|
||
"name": "收银台",
|
||
"pathName": "INDEX/pay/index",
|
||
"query": "id=3&amount=100",
|
||
"launchMode": "default",
|
||
"scene": null
|
||
}
|
||
]
|
||
}
|
||
},
|
||
"projectname": "%E8%80%81%E6%9D%BF%E5%BC%80%E5%8F%91",
|
||
"setting": {
|
||
"compileHotReLoad": true,
|
||
"urlCheck": false,
|
||
"coverView": false,
|
||
"lazyloadPlaceholderEnable": false,
|
||
"skylineRenderEnable": false,
|
||
"preloadBackgroundData": false,
|
||
"autoAudits": false,
|
||
"useApiHook": true,
|
||
"useApiHostProcess": true,
|
||
"showShadowRootInWxmlPanel": false,
|
||
"useStaticServer": false,
|
||
"useLanDebug": false,
|
||
"showES6CompileOption": false,
|
||
"checkInvalidKey": true,
|
||
"ignoreDevUnusedFiles": true,
|
||
"bigPackageSizeSupport": true
|
||
},
|
||
"libVersion": "3.8.9"
|
||
} |