toktok

toktok-admin-screen/config/dev.env.js

@@ -1,5 +1,5 @@
 module.exports = {
-    NODE_ENV: '"development"',
-    ENV_CONFIG: '"dev"',
-    BASE_API: '"/api/tsa"'
+  NODE_ENV: '"development"',
+  ENV_CONFIG: '"dev"',
+  BASE_API: '"/api/tsa"'
 }

toktok-admin-screen/config/index.js

@@ -12,7 +12,7 @@ module.exports = {
         // target: 'http://stores.toktok.beer',//生产后端接口地址
         changeOrigin: true,  //是否跨域
         pathRewrite: {
-            '^/api': '/',//重写,
+          '^/api': '/',//重写,
         }
       }
     },

toktok-admin-screen/index.html

@@ -10,7 +10,7 @@
     <script src="//unpkg.com/tinymce@5.1.5/tinymce.min.js"></script>
     <style>
       .el-table__body-wrapper {
-          overflow-y: auto !important;
+        overflow-y: auto !important;
       }
     </style>
   </head>
@@ -18,4 +18,3 @@
     <div id="app"></div>
   </body>
 </html>
-

toktok-admin-screen/src/views/toktok-stores/upload_file.vue

@@ -20,7 +20,7 @@
     <el-dialog :visible.sync="dialogVisible_add" title="素材上传" width="600px" top="32px">
       <el-form ref="addForm" label-width="80px" label-position="right" size="medium">
         <el-form-item label="上传路径:" prop="title">
-          <el-input v-model="subPath" placeholder="例：stores/factory/" />
+          <el-input v-model="subPath" placeholder="例：stores/material/" />
         </el-form-item>
         <el-form-item label="文件:" style="width:400px">
             <el-upload
@@ -42,7 +42,7 @@
 
   </div>
 </template>
- 
+
 <script>
 import { upload_file } from '@/api/projection'
 import { scrollTo } from '@/utils/scrollTo'
@@ -51,7 +51,7 @@ export default {
   data() {
     return {
       dialogVisible_add: false,
-      subPath: '',
+      subPath: 'stores/material/',
       params: null,
       img_url: [
         // {

toktok-wx-applet/pages/beerBoxPayment/beerBoxPayment.js

@@ -91,7 +91,7 @@ Page({
       }
     )
   },
-  //支付回调
+  //测试环境支付
   orderPayGet(orderId) {
     let that = this;
     request.getData(
@@ -105,6 +105,19 @@ Page({
       }
     )
   },
+  //微信小程序统一下单
+  wxpayOrderPay(orderId) {
+    let that = this;
+    request.postData(
+      'app/pay/wxpay/program/unified',{orderId: orderId},
+      res => {
+        console.log(res)
+      },
+      res => {
+        console.log(res)
+      }
+    )
+  },
   //创建订单
   createOrder() {
     let that = this;
@@ -120,7 +133,8 @@ Page({
       res => {
         console.log(res.data.data)
         let orderId = res.data.data;
-        this.orderPayGet(orderId);
+        this.wxpayOrderPay(orderId);
+        // this.orderPayGet(orderId);
       }
     )
   },