Merge branch 'master' into dev

package-lock.json

@@ -17,6 +17,7 @@
         "cross-env": "^7.0.3",
         "dayjs": "^1.10.5",
         "element-ui": "^2.15.2",
+        "js-file-download": "^0.4.12",
         "lodash": "^4.17.21",
         "qrcode.vue": "^1.7.0",
         "vue": "^2.6.12",
@@ -8563,6 +8564,11 @@
       "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
       "dev": true
     },
+    "node_modules/js-file-download": {
+      "version": "0.4.12",
+      "resolved": "https://registry.npmjs.org/js-file-download/-/js-file-download-0.4.12.tgz",
+      "integrity": "sha512-rML+NkoD08p5Dllpjo0ffy4jRHeY6Zsapvr/W86N7E0yuzAO6qa5X9+xog6zQNlH102J7IXljNY2FtS6Lj3ucg=="
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -21820,6 +21826,11 @@
       "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
       "dev": true
     },
+    "js-file-download": {
+      "version": "0.4.12",
+      "resolved": "https://registry.npmjs.org/js-file-download/-/js-file-download-0.4.12.tgz",
+      "integrity": "sha512-rML+NkoD08p5Dllpjo0ffy4jRHeY6Zsapvr/W86N7E0yuzAO6qa5X9+xog6zQNlH102J7IXljNY2FtS6Lj3ucg=="
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

package.json

@@ -80,6 +80,7 @@
     "cross-env": "^7.0.3",
     "dayjs": "^1.10.5",
     "element-ui": "^2.15.2",
+    "js-file-download": "^0.4.12",
     "lodash": "^4.17.21",
     "qrcode.vue": "^1.7.0",
     "vue": "^2.6.12",

src/api/order.js

@@ -39,3 +39,10 @@ export function orderSearch(data) {
 export function getOrderLogs(data) {
   return httpRequest.post('/api/shop/order/logs/search', data)
 }
+
+/**
+ * 导出订单
+ */
+export function exportOrder(data) {
+  return httpRequest.post('/api/shop/order/range/search/download', data, { responseType: 'blob' })
+}

src/pages/goods/goods/edit.vue

@@ -118,6 +118,20 @@
           </el-radio-group>
         </el-form-item>
       </app-card>
+      <app-card title="更多设置">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="服务说明">
+              <el-input v-model="ruleForm.spare.service_desc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="购买说明">
+              <el-input v-model="ruleForm.spare.buy_desc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </app-card>
     </el-form>
     <app-card v-show="stepActive === 2">
       <div class="goods-detail">
@@ -201,7 +215,8 @@ export default {
         buy_limit: '1', // 限购
         goodStockList: [], // 规格明细
         skuKeyValueList: [],
-        messageList: [] // 留言
+        messageList: [], // 留言
+        spare: {}
       },
       buyButtonTextRadio: '1',
       rules: {
@@ -262,6 +277,12 @@ export default {
         } catch (error) {
           console.log('留言解析失败', error)
         }
+        // 额外页面配置
+        try {
+          this.ruleForm.spare = data.spare ? JSON.parse(data.spare) : {}
+        } catch (error) {
+          console.log('额外页面配置信息解析失败', error)
+        }
         // 购买按钮
         this.buyButtonTextRadio = data.buy_button_text === '立即购买' ? '1' : '2'
         this.loading = false
@@ -344,6 +365,7 @@ export default {
           const params = Object.assign({ shop_id: this.shopId }, this.ruleForm)
           params.chart_oss = JSON.stringify(params.chart_oss)
           params.spec = JSON.stringify(params.goodStockList)
+          params.spare = JSON.stringify(params.spare)
           params.app_button_text = JSON.stringify(params.messageList)
           this.isEdit ? this.handleEdit(params, callback) : this.handleAdd(params, callback)
         })

src/pages/order/index.vue

@@ -8,6 +8,11 @@
       border
       ref="list"
     >
+      <div class="tab-aside">
+        <div class="tab-aside-buttons">
+          <el-button type="primary" size="medium" @click="handleExport">导出</el-button>
+        </div>
+      </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane :label="item.label" :name="item.value" v-for="item in orderStatus" :key="item.value"></el-tab-pane>
       </el-tabs>
@@ -80,12 +85,13 @@
 
 <script>
 import dayjs from 'dayjs'
+import fileDownload from 'js-file-download'
 // 组件
 import TableList from '@/components/base/tableList.vue'
 import AppCard from '@/components/base/card.vue'
 import GoodsItem from '@/components/goods/goodsItem.vue'
 // 接口
-import { getOrderSearchList } from '@/api/order'
+import { getOrderSearchList, exportOrder } from '@/api/order'
 export default {
   components: { AppCard, TableList, GoodsItem },
   data() {
@@ -103,7 +109,14 @@ export default {
       ],
       orderStartTime: '',
       orderEndTime: '',
-      orderActiveDay: ''
+      orderActiveDay: '',
+      params: {
+        shop_id: this.$store.state.shopId,
+        search_field: 'spu_name',
+        search_value: '',
+        order_status: '',
+        payment_method: ''
+      }
     }
   },
   computed: {
@@ -112,13 +125,7 @@ export default {
       return {
         remote: {
           httpRequest: getOrderSearchList,
-          params: {
-            shop_id: this.$store.state.shopId,
-            search_field: 'spu_name',
-            search_value: '',
-            order_status: '',
-            payment_method: ''
-          },
+          params: this.params,
           beforeRequest: this.beforeRequest,
           callback: this.callback
         },
@@ -226,6 +233,13 @@ export default {
       }
       return map[value] || value
     },
+    // 导出
+    handleExport() {
+      exportOrder(this.params).then(response => {
+        const datetime = dayjs().format('YYYY-MM-DD-HH-mm-ss')
+        fileDownload(response, `Order_zijing_${datetime}.csv`)
+      })
+    },
     // tab
     handleClick() {
       this.$refs.list.refetch(true)
@@ -257,6 +271,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.tab-aside {
+  position: relative;
+  z-index: 10;
+}
+.tab-aside-buttons {
+  position: absolute;
+  right: 0;
+}
 ::v-deep .filter-buttons {
   display: block;
   padding-left: 68px;

src/store/index.js

@@ -17,11 +17,15 @@ const store = new Vuex.Store({
       { label: '玛丽伍德综合管理方向工商管理硕士', value: '1012' },
       { label: '索菲亚大学金融方向工商管理硕士', value: '1000' },
       { label: '瑞士酒店大学酒店及旅游业工商管理硕士', value: '1008' },
+      { label: '瑞士美食艺术管理大学CAAS餐饮管理MBA', value: '1015' },
       { label: '美国印第安纳大学Kelley商学院金融学硕士', value: '1001' },
       { label: '加州整合大学应用心理学硕士', value: '1006' },
       { label: '美国康博斯威尔大学教育学硕士', value: '1005' },
       { label: '中国未来金融领袖计划', value: '1007' },
-      { label: '道路运输企业', value: '5001' }
+      { label: 'WMP高级财富管理师', value: '5000' },
+      { label: '道路运输企业', value: '5001' },
+      { label: '1+X', value: '5002' },
+      { label: 'PRP', value: '5003' }
     ],
     // 费用类型
     feeTypes: []