尊荣订单

src/router/index.js

@@ -8,6 +8,7 @@ import platfinance from './module/platfinance';
 import platSettings from './module/platSettings';
 import zr from './module/zr';
 import dev from './module/dev';
+import account from './module/account';
 Vue.use(VueRouter);
 
 const routes = [
@@ -37,6 +38,7 @@ const routes = [
       ...platmanag,
       ...platfinance,
       ...zr,
+      ...account,
     ],
   },
 ];

src/router/module/account.js

@@ -0,0 +1,8 @@
+export default [
+  {
+    path: '/account/account',
+    name: 'account_account',
+    meta: { title: '账号管理-修改密码' },
+    component: () => import('@/views/account/account/index.vue'),
+  },
+];

src/router/module/zr.js

@@ -2,13 +2,19 @@ export default [
   {
     path: '/zr/zrGoods',
     name: 'zr_zrGoods',
-    meta: { title: '自营店铺-尊荣商品' },
+    meta: { title: '尊荣管理-尊荣商品' },
     component: () => import('@/views/zr/zrGoods/index.vue'),
   },
   {
     path: '/zr/zrOrder',
     name: 'zr_zrOrder',
-    meta: { title: '自营店铺-尊荣订单' },
+    meta: { title: '尊荣管理-尊荣订单' },
     component: () => import('@/views/zr/zrOrder/index.vue'),
   },
+  {
+    path: '/zr/zrOrder/detail_orderDetail',
+    name: 'zr_zrOrder_detail_orderDetail',
+    meta: { title: '尊荣管理-订单管理-详细信息' },
+    component: () => import('@/views/zr/zrOrder/detail_orderDetail.vue'),
+  },
 ];

src/views/account/account/index.vue

@@ -0,0 +1,63 @@
+<template>
+  <div id="index">
+    <data-form :span="24" :fields="fields" :rules="rules" v-model="form" labelWidth="150px" @save="toSave"> </data-form>
+  </div>
+</template>
+
+<script>
+import { mapState, mapMutations, createNamespacedHelpers } from 'vuex';
+const { mapActions: admins } = createNamespacedHelpers('admins');
+
+export default {
+  name: 'index',
+  props: {},
+  components: {},
+  data: function () {
+    return {
+      fields: [
+        { label: '名称', model: 'name', readonly: true },
+        { label: '密码', model: 'password', type: 'password' },
+      ],
+      rules: {},
+      form: {},
+      roleList: [],
+    };
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  async created() {
+    await this.search();
+  },
+  methods: {
+    ...mapMutations(['deleteUser']),
+    ...admins([, 'fetch', 'update']),
+    //执行查询
+    async search() {
+      const res = await this.fetch(this.user.id);
+      if (this.$checkRes(res)) {
+        this.$set(this, `form`, res.data);
+      }
+    },
+    // 保存
+    async toSave({ data }) {
+      const res = await this.update(data);
+      this.$checkRes(res, '操作成功', '操作失败');
+      this.logout();
+    },
+    // 退出登录
+    logout() {
+      this.deleteUser();
+      // 路由也得删除,但是没有删除路由的API,所以用replace来替换下
+      const base = _.get(this.$router, 'options.base', '');
+      window.location.replace(`/${base}/login`);
+      // this.$router.push('/login');
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/zr/zrOrder/detail_orderDetail.vue

@@ -20,59 +20,31 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="shop"> <i class="el-icon-s-shop"></i>{{ shop.name }}</el-col>
-          <el-col :span="24" v-for="(item, index) in list" :key="index">
+          <el-col :span="24">
             <el-col :span="24" class="goods bode">
-              <el-col :span="6"><el-image :src="item.goods.file[0].url"></el-image></el-col>
+              <el-col :span="6"><el-image :src="url"></el-image></el-col>
               <el-col :span="18">
                 <el-col :span="12">
                   <el-col>
-                    <p>{{ item.goods.name }}</p>
-                  </el-col>
-                  <el-col>
-                    <p>规格：{{ item.name }}</p>
+                    <p>{{ goods.name }}</p>
                   </el-col>
                 </el-col>
                 <el-col :span="12" class="money">
                   <el-col>
-                    <p v-if="form.type == '0'">￥{{ item.sell_money }}</p>
-                    <p v-else-if="form.type == '1'">￥{{ item.group_config.money }}</p>
-                  </el-col>
-                  <el-col>
-                    <p>X{{ item.buy_num }}</p>
+                    <p>尊荣：{{ goods.cost }}</p>
                   </el-col>
                   <el-col>
-                    <span class="spanfour" style="color: blue" @click="toUrl(item.goods.url)"> 查看商品来源:{{ item.goods.source }}</span>
+                    <p>X{{ form.buy_num }}</p>
                   </el-col>
                 </el-col>
               </el-col>
             </el-col>
-            <el-col :span="24" class="bode">
-              <el-col :span="6">运费</el-col>
-              <el-col :span="18" class="other" v-if="!item.goods.freight == '0'">{{ item.goods.freight }}</el-col>
-              <el-col :span="18" class="other" v-else>包邮</el-col>
-            </el-col>
           </el-col>
           <el-col :span="24" class="bode">
             <el-col :span="6">订单备注</el-col>
             <el-col :span="18" class="other" v-if="form.remarks">{{ form.remarks }}</el-col>
             <el-col :span="18" class="other" v-else>暂无备注</el-col>
           </el-col>
-          <el-col :span="24" class="bode">
-            <el-col :span="6">配送方式</el-col>
-            <el-col :span="18" class="other">快递配送</el-col>
-          </el-col>
-          <el-col :span="24" class="goods_total bode">
-            <el-col :span="6">快递费</el-col>
-            <el-col :span="18" class="other">
-              <p>￥{{ total_detail.freight_total }}</p>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="goods_total bode">
-            <el-col :span="8">优惠后实付金额</el-col>
-            <el-col :span="16" class="other">
-              <p>￥{{ pay.pay_money }}</p>
-            </el-col>
-          </el-col>
           <el-col :span="24" class="bode">
             <el-col :span="6">下单时间</el-col>
             <el-col :span="18" class="other">{{ form.buy_time }}</el-col>
@@ -155,7 +127,7 @@
 const _ = require('lodash');
 const moment = require('moment');
 import { mapState, mapGetters, createNamespacedHelpers } from 'vuex';
-const { mapActions } = createNamespacedHelpers('orderDetail');
+const { mapActions } = createNamespacedHelpers('zrOrder');
 const { mapActions: dictData } = createNamespacedHelpers('dictData');
 const { mapActions: sot } = createNamespacedHelpers('sot');
 
@@ -175,8 +147,9 @@ export default {
       // 运单号
       transport: {},
       pay: {},
+      url: '',
       // 商品列表
-      list: [],
+      goods: {},
       // 物流
       reverse: false,
       activities: [],
@@ -190,7 +163,6 @@ export default {
   },
   async created() {
     await this.searchOther();
-
     await this.search();
   },
   methods: {
@@ -203,14 +175,12 @@ export default {
       res = await this.fetch(this.id);
       if (this.$checkRes(res)) {
         this.$set(this, `form`, res.data);
-        // 地址
+        // // 地址
         this.$set(this, `address`, res.data.address);
         this.$set(this, `shop`, res.data.shop);
-        // 商品
-        this.$set(this, `list`, res.data.goods);
-        // 应付金额
-        this.$set(this, `total_detail`, res.data.total_detail);
-        this.$set(this, `pay`, res.data.order.pay);
+        // // 商品
+        this.$set(this, `goods`, res.data.goods);
+        this.$set(this, `url`, res.data.goods.file[0].url);
         if (res.data.transport) {
           let arr = await this.dictQuery({ code: 'transport_type', value: res.data.transport.shop_transport_type });
           if (this.$checkRes(arr)) {
@@ -238,14 +208,7 @@ export default {
       }
       this.loading = false;
     },
-    toUrl(url) {
-      if (url) {
-        window.open(url, '_blank');
-      } else {
-        this.$message.error('该商品还未添加网址，无法跳转');
-      }
-    },
-    handleSelect(value) {},
+    handleSelect() {},
     // 提交
     async onSubmit() {
       let form = this.form;

src/views/zr/zrOrder/parts/detail-1.vue

@@ -50,9 +50,7 @@ export default {
         { label: '下单时间', model: 'buy_time' },
         { label: '顾客', model: 'customer.name' },
         { label: '店铺名称', model: 'shop.name' },
-        { label: '支付金额', model: 'real_pay' },
-        { label: '商品数量', model: 'buy_num_total' },
-        { label: '是否售后', model: 'is_afterSale', format: (i) => (i === true ? '该订单有商品申请售后' : '未申请售后') },
+        { label: '兑换数量', model: 'buy_num' },
       ],
       // 多选值
       selected: [],

src/views/zr/zrOrder/parts/detail-2.vue

@@ -46,8 +46,8 @@ export default {
       list: [],
       fields: [
         { label: '订单编号', model: 'order_no' },
-        { label: '商品名称', model: 'goods.name' },
-        { label: '商品规格', model: 'name' },
+        { label: '商品名称', model: 'name' },
+        // { label: '商品规格', model: 'name' },
         { label: '商品数量', model: 'buy_num' },
       ],
       selected: [],
@@ -67,35 +67,21 @@ export default {
         for (const p1 of test) {
           let goodsList = [];
           for (const p2 of p1) {
-            if (p2.is_afterSale == false) {
-              for (let p3 of p2.goods) {
-                // _.pick(p3, ['goods', 'name', 'buy_num']);
-                // let p3_2 = (({ goods, name, buy_num }) => ({ goods, name, buy_num }))(p3);
-                delete p3.flow_money;
-                delete p3.freight;
-                delete p3.id;
-                delete p3.status;
-                delete p3._id;
-                delete p3.meta;
-                delete p3.num;
-                delete p3.sell_money;
-                delete p3.__v;
-                delete p3.tags;
-                delete p3.cart_id;
-                delete p3.can_group;
-                delete p3.group_config;
-                delete p3.url;
-                let good = (({ name }) => ({ name }))(p3.goods);
-                p3.goods = good;
-                p3.order_no = p2.no;
-              }
-              goodsList.push(...p2.goods);
-              let i = 0;
-              for (const p4 of goodsList) {
-                p4.index = i;
-                i++;
-              }
-            }
+            delete p2.goods.brief;
+            delete p2.goods.cost;
+            delete p2.goods.file;
+            delete p2.goods.send_time;
+            delete p2.goods.shop;
+            delete p2.goods.shot_brief;
+            delete p2.goods.sort;
+            p2.goods.order_no = p2.no;
+            p2.goods.buy_num = p2.buy_num;
+            goodsList.push({ ...p2.goods });
+          }
+          let i = 0;
+          for (const p4 of goodsList) {
+            p4.index = i;
+            i++;
           }
           let address = _.pick(p1[0].address, ['name', 'phone', 'province', 'city', 'area', 'address', '_id']);
           list.push({ goodsList, address });
@@ -178,10 +164,10 @@ export default {
           ['收获人', p1.address.name],
           ['联系电话', p1.address.phone],
           ['收货地址', p1.address.province + p1.address.city + p1.address.area + p1.address.address],
-          ['订单号', '产品名称', '产品规格', '购买数量'],
+          ['订单号', '产品名称', '购买数量'],
         ];
         for (const p2 of p1.goodsList) {
-          let p4 = [[p2.order_no, p2.goods.name, p2.name, p2.buy_num]];
+          let p4 = [[p2.order_no, p2.name, p2.buy_num]];
           data.push(...p4);
         }
         const row = worksheet.getRow(1);