Merge remote-tracking branch 'gogs/dev2.0' into dev2.0

# Conflicts:
#	common/js/env.js

.idea/.gitignore

@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/

.idea/chain_jje_uniapp.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,33 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="myValues">
-        <value>
-          <list size="19">
-            <item index="0" class="java.lang.String" itemvalue="nobr" />
-            <item index="1" class="java.lang.String" itemvalue="noembed" />
-            <item index="2" class="java.lang.String" itemvalue="comment" />
-            <item index="3" class="java.lang.String" itemvalue="noscript" />
-            <item index="4" class="java.lang.String" itemvalue="embed" />
-            <item index="5" class="java.lang.String" itemvalue="script" />
-            <item index="6" class="java.lang.String" itemvalue="u-icon" />
-            <item index="7" class="java.lang.String" itemvalue="u-button" />
-            <item index="8" class="java.lang.String" itemvalue="u-grid" />
-            <item index="9" class="java.lang.String" itemvalue="u-grid-item" />
-            <item index="10" class="java.lang.String" itemvalue="swiper-item" />
-            <item index="11" class="java.lang.String" itemvalue="mescroll-uni" />
-            <item index="12" class="java.lang.String" itemvalue="swiper" />
-            <item index="13" class="java.lang.String" itemvalue="u-sticky" />
-            <item index="14" class="java.lang.String" itemvalue="u-tabs" />
-            <item index="15" class="java.lang.String" itemvalue="view" />
-            <item index="16" class="java.lang.String" itemvalue="u-datetime-picker" />
-            <item index="17" class="java.lang.String" itemvalue="uni-popup" />
-            <item index="18" class="java.lang.String" itemvalue="u-swiper" />
-          </list>
-        </value>
-      </option>
-      <option name="myCustomValuesEnabled" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/chain_jje_uniapp.iml" filepath="$PROJECT_DIR$/.idea/chain_jje_uniapp.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

common/js/api.js

@@ -36,7 +36,7 @@ export default {
     //我的活动详情
     myActivityDetail(data) {
         return request({
-            url: '/business/wechat/activity/detail',
+            url: '/order/wechat/activity/detail',
             method: 'GET',
             data: data
         })
@@ -45,14 +45,14 @@ export default {
     //我的活动
     myActivity(data) {
         return request({
-            url: '/business/wechat/myActivity',
+            url: '/order/wechat/myActivity',
             method: 'GET',
             data: data
         })
     },
     myActivityIsShow(data) {
         return request({
-            url: '/business/wechat/myActivityIsShow',
+            url: '/order/wechat/myActivityIsShow',
             method: 'GET',
             data: data
         })
@@ -190,7 +190,7 @@ export default {
     //post请求  一键付款余额支付
     trade(data) {
         return request({
-            url: '/business/balancePay/pay/trade',
+            url: '/order/balancePay/pay/trade',
             method: 'POST',
             data: data
         })
@@ -199,7 +199,7 @@ export default {
     //post请求  订单详情付款
     qenPayInfo(data) {
         return request({
-            url: '/business/wechat/order/genPayInfo',
+            url: '/order/wechat/order/genPayInfo',
             method: 'POST',
             data: data
         })
@@ -208,7 +208,7 @@ export default {
     //post请求  一键付款获取微信支付信息
     wechatPayTradeNo(data) {
         return request({
-            url: '/business/wxPay/jsapiPay/tradeNo?tradeNo=' + data.tradeNo,
+            url: '/order/wxPay/jsapiPay/tradeNo?tradeNo=' + data.tradeNo,
             method: 'POST',
             data: data
         })
@@ -218,7 +218,7 @@ export default {
     //post请求  一键付款
     oneClickPay(data) {
         return request({
-            url: '/business/wechat/order/oneClickPay?orderId=' + data.orderId,
+            url: '/order/wechat/order/oneClickPay?orderId=' + data.orderId,
             method: 'POST',
             data: data
         })
@@ -228,7 +228,7 @@ export default {
     //post请求  申诉
     appeal(data) {
         return request({
-            url: '/business/wechat/order/appeal',
+            url: '/order/wechat/order/appeal',
             method: 'POST',
             data: data
         })
@@ -237,7 +237,7 @@ export default {
     //post请求 添加子订单
     addChildProject(data) {
         return request({
-            url: '/business/wechat/order/submit/child',
+            url: '/order/wechat/order/submit/child',
             method: 'POST',
             data: data
         })
@@ -312,7 +312,7 @@ export default {
     // get请求，获取订单列表
     getOrderList(data) {
         return request({
-            url: '/business/wechat/order/list',
+            url: '/order/wechat/order/list',
             method: 'GET',
             data: data
         })
@@ -320,7 +320,7 @@ export default {
     // get请求，获取订单详情
     getOrderDetailByOrderId(data) {
         return request({
-            url: '/business/wechat/order/detail',
+            url: '/order/wechat/order/detail',
             method: 'GET',
             data: data
         })
@@ -328,7 +328,7 @@ export default {
     // get请求，保存订单评价
     saveOrderComment(data) {
         return request({
-            url: '/business/wechat/order/comment' + data.orderId,
+            url: '/order/wechat/order/comment' + data.orderId,
             method: 'GET',
             data: data
         })
@@ -336,7 +336,7 @@ export default {
     // post请求，再来一单
     comeOrder(data) {
         return request({
-            url: '/business/wechat/order/copy/' + data.orderId,
+            url: '/order/wechat/order/copy/' + data.orderId,
             method: 'POST',
             data: data
         })
@@ -345,7 +345,7 @@ export default {
     // post请求  删除订单
     deleteOrder(data) {
         return request({
-            url: '/business/wechat/order/' + data.orderId,
+            url: '/order/wechat/order/' + data.orderId,
             method: 'POST',
             data: data
         })
@@ -353,7 +353,7 @@ export default {
     // put请求  取消订单
     cancelOrder(data) {
         return request({
-            url: '/business/wechat/order/cancel/' + data.orderId,
+            url: '/order/wechat/order/cancel/' + data.orderId,
             method: 'PUT',
             data: data
         })
@@ -363,7 +363,7 @@ export default {
     // post请求，通用下单接口
     commonGeneralOrder(data) {
         return request({
-            url: '/business/wechat/order/common',
+            url: '/order/wechat/order/common',
             method: 'POST',
             data: data
         })
@@ -372,7 +372,7 @@ export default {
     // get请求，查询充值订单列表
     orderRechargeList(data) {
         return request({
-            url: '/business/wechat/orderRecharge/list',
+            url: '/order/wechat/orderRecharge/list',
             method: 'GET',
             data: data
         })
@@ -381,7 +381,7 @@ export default {
     // post请求，充值订单退款
     orderRechargeRefund(data) {
         return request({
-            url: '/business/wechat/orderRecharge/refund',
+            url: '/order/wechat/orderRecharge/refund',
             method: 'POST',
             data: data
         })
@@ -390,7 +390,7 @@ export default {
     // post请求，获取用户余额
     getUserBalance(data) {
         return request({
-            url: '/business/wechat/orderRecharge/getBalance',
+            url: '/order/wechat/orderRecharge/getBalance',
             method: 'POST',
             data: data
         })
@@ -399,7 +399,7 @@ export default {
     // get请求，订单签到
     orderSign(data) {
         return request({
-            url: '/business/wechat/scheduling/orderSign',
+            url: '/scheduling/wechat/scheduling/orderSign',
             method: 'GET',
             data: data
         })
@@ -407,7 +407,7 @@ export default {
     // get请求，查看订单排号情况
     getOrderSign(data) {
         return request({
-            url: '/business/wechat/scheduling/getOrderSign',
+            url: '/scheduling/wechat/scheduling/getOrderSign',
             method: 'GET',
             data: data
         })
@@ -416,7 +416,7 @@ export default {
     // post请求，微信支付（根据订单ID）
     wechatPay(data) {
         return request({
-            url: '/business/wxPay/jsapiPay?orderNo=' + data.orderNo,
+            url: '/order/wxPay/jsapiPay?orderNo=' + data.orderNo,
             method: 'POST',
             data: data
         })
@@ -425,7 +425,7 @@ export default {
     // post请求，余额支付（根据订单ID）
     balancePay(data) {
         return request({
-            url: '/business/balancePay/pay?orderNo=' + data.orderNo + '&password=' + data.password,
+            url: '/order/balancePay/pay?orderNo=' + data.orderNo + '&password=' + data.password,
             method: 'POST',
             data: data
         })
@@ -433,7 +433,7 @@ export default {
     // get请求，查询交易记录列表
     transactionRecordsList(data) {
         return request({
-            url: '/business/wechat/transactionFlow/list',
+            url: '/order/wechat/transactionFlow/list',
             method: 'GET',
             data: data
         })
@@ -441,7 +441,7 @@ export default {
     // get请求，查询充值优惠列表
     getRechargeList() {
         return request({
-            url: '/business/wechat/getRechargeList',
+            url: '/order/wechat/getRechargeList',
             method: 'GET'
         })
     },
@@ -449,7 +449,7 @@ export default {
     // get请求，查询交易流水统计
     transactionFlowstatistic(data) {
         return request({
-            url: '/business/wechat/transactionFlow/statistic',
+            url: '/order/wechat/transactionFlow/statistic',
             method: 'GET',
             data: data
         })
@@ -784,7 +784,7 @@ export default {
     // get请求 根据服务日期及服务时段查询排班人员
     serviceWorkPersonList(data) {
         return request({
-            url: '/business/wechat/scheduling/crewPageList',
+            url: '/scheduling/wechat/scheduling/crewPageList',
             method: 'GET',
             data: data
         })
@@ -793,7 +793,7 @@ export default {
     // get请求 根据门店查询排班日期
     selectDate(data) {
         return request({
-            url: '/business/wechat/scheduling/selectDate',
+            url: '/scheduling/wechat/scheduling/selectDate',
             method: 'POST',
             data: data
         })
@@ -802,7 +802,7 @@ export default {
     // get请求 根据门店、排班日期查询可用时段
     selectPeriodByDate(data) {
         return request({
-            url: '/business/wechat/scheduling/selectPeriodByDate',
+            url: '/scheduling/wechat/scheduling/selectPeriodByDate',
             method: 'POST',
             data: data
         })
@@ -811,7 +811,7 @@ export default {
     // get请求 根据门店、排班日期查询可用时段
     getServiceTime(data) {
         return request({
-            url: '/business/wechat/scheduling/time',
+            url: '/scheduling/wechat/scheduling/time',
             method: 'GET',
             data: data
         })
@@ -820,7 +820,7 @@ export default {
     // get请求 根据门店、排班日期查询可用时段
     getServicePerson(data) {
         return request({
-            url: '/business/wechat/scheduling/person',
+            url: '/scheduling/wechat/scheduling/person',
             method: 'GET',
             data: data
         })
@@ -829,7 +829,7 @@ export default {
     // get请求 根据门店、排班日期查询可用时段
     getServicePersonTime(data) {
         return request({
-            url: '/business/wechat/scheduling/person/time',
+            url: '/scheduling/wechat/scheduling/person/time',
             method: 'GET',
             data: data
         })
@@ -838,7 +838,7 @@ export default {
     // get请求 查询可领取的优惠劵列表
     getUserDiscountsList(data) {
         return request({
-            url: '/business/wechat/getUserDiscountsList',
+            url: '/order/wechat/getUserDiscountsList',
             method: 'GET',
             data: data
         })
@@ -1027,7 +1027,7 @@ export default {
     },
     serviceProjectList(param) {
         return request({
-            url: '/business/storeManager/minMain/service',
+            url: '/order/storeManager/minMain/service',
             method: 'get',
             data: param
         })
@@ -1054,7 +1054,7 @@ export default {
     // 订单支付页面选择优惠券或者权益卡列表
     availableEquityCards(data) {
         return request({
-            url: '/business/wechat/order/availableEquityCards',
+            url: '/order/wechat/order/availableEquityCards',
             method: 'get',
             data: data
         })
@@ -1064,7 +1064,7 @@ export default {
     // 订单支付页面选择优惠券或者权益卡列表
     availableCoupons(data) {
         return request({
-            url: '/business/wechat/order/availableCoupons',
+            url: '/order/wechat/order/availableCoupons',
             method: 'get',
             data: data
         })
@@ -1074,7 +1074,7 @@ export default {
     // 订单支付页面选择优惠券或者权益卡列表
     oneClickPayV2(data) {
         return request({
-            url: '/business/wechat/order/oneClickPay/v2',
+            url: '/order/wechat/order/oneClickPay/v2',
             method: 'post',
             data: data
         })
@@ -1084,7 +1084,7 @@ export default {
     // 获取亲情卡优惠券
     getCouponByLoveCard(data) {
         return request({
-            url: '/business/wechat/order/getCouponByLoveCard',
+            url: '/order/wechat/order/getCouponByLoveCard',
             method: 'get',
             data: data
         })

common/js/env.js

@@ -11,8 +11,8 @@ let trialActivityImgUrl = `https://minio.xinyuekj.com.cn/jje-test/`
 /** 开发环境*/
 // let developBaseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
 // let developBaseUrl = `https://jje.xinyuekj.com.cn/prod-api`
-let developBaseUrl = `https://jje.xinyuekj.com.cn/test-api`
-// let developBaseUrl = `http://192.168.2.90:9201`
+	// let developBaseUrl = `https://jje.xinyuekj.com.cn/test-api`
+	let developBaseUrl = `http://192.168.31.197:9201`
 let developActivityImgUrl = `https://minio.xinyuekj.com.cn/jje-test/`
 
 

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "chain_jje_uniapp",
+  "name": "jje_uniapp",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {