Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

� Conflicts:
�	yudao-ui-admin/yarn.lock

Author: shizhong

.env.front

@@ -0,0 +1,23 @@
+# 开发环境配置
+ENV = 'development'
+
+# 页面标题
+VUE_APP_TITLE = 芋道管理系统
+
+# 芋道管理系统/本地环境
+VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# 多租户的开关
+VUE_APP_TENANT_ENABLE = true
+
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
+# 文档的开关
+VUE_APP_DOC_ENABLE = true
+
+# 百度统计
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

.env.demo1024 renamed to .env.static

@@ -10,9 +10,9 @@ VUE_APP_TITLE = 芋道管理系统
 VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 
 # 根据服务器或域名修改
-PUBLIC_PATH = '/admin-ui/'
+PUBLIC_PATH = '/admin-ui-vue2/'
 # 二级部署路径
-VUE_APP_APP_NAME ='/admin-ui/'
+VUE_APP_APP_NAME ='/admin-ui-vue2/'
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true

package.json

@@ -1,16 +1,17 @@
 {
   "name": "yudao-ui-admin",
-  "version": "1.7.0-snapshot",
+  "version": "1.7.1-snapshot",
   "description": "芋道管理系统",
   "author": "芋道",
   "license": "MIT",
   "scripts": {
     "local": "vue-cli-service serve --mode local",
     "dev": "vue-cli-service serve --mode dev",
+    "front": "vue-cli-service serve --mode front",
     "build:prod": "vue-cli-service build --mode prod",
     "build:stage": "vue-cli-service build --mode stage",
     "build:dev": "vue-cli-service build --mode dev",
-    "build:demo1024": "vue-cli-service build --mode demo1024",
+    "build:static": "vue-cli-service build --mode static",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "clean": "rimraf node_modules"
@@ -57,6 +58,7 @@
     "jsencrypt": "3.3.1",
     "min-dash": "3.5.2",
     "nprogress": "0.2.0",
+    "qrcode.vue": "^1.7.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",

src/api/pay/demo.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 创建示例订单
+export function createDemoOrder(data) {
+  return request({
+    url: '/pay/demo-order/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得示例订单
+export function getDemoOrder(id) {
+  return request({
+    url: '/pay/demo-order/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得示例订单分页
+export function getDemoOrderPage(query) {
+  return request({
+    url: '/pay/demo-order/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 退款示例订单
+export function refundDemoOrder(id) {
+  return request({
+    url: '/pay/demo-order/refund?id=' + id,
+    method: 'put'
+  })
+}

src/api/pay/order.js

@@ -1,23 +1,5 @@
 import request from '@/utils/request'
 
-// 创建支付订单
-export function createOrder(data) {
-  return request({
-    url: '/pay/order/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新支付订单
-export function updateOrder(data) {
-  return request({
-    url: '/pay/order/update',
-    method: 'put',
-    data: data
-  })
-}
-
 // 删除支付订单
 export function deleteOrder(id) {
   return request({
@@ -34,6 +16,23 @@ export function getOrder(id) {
   })
 }
 
+// 获得支付订单的明细
+export function getOrderDetail(id) {
+  return request({
+    url: '/pay/order/get-detail?id=' + id,
+    method: 'get'
+  })
+}
+
+// 提交支付订单
+export function submitOrder(data) {
+  return request({
+    url: '/pay/order/submit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 获得支付订单分页
 export function getOrderPage(query) {
   return request({