YY 2 年 前
コミット
082bb8d8f0

+ 7 - 2
src/views/platSettings/config/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div id="index">
-    <data-form :span="12" :fields="fields" :rules="rules" v-model="form" labelWidth="150px" @save="toSave"> </data-form>
+    <data-form :span="24" :fields="fields" :rules="rules" v-model="form" labelWidth="150px" @save="toSave">
+      <template #agree>
+        <editor v-model="form.agree" url="/files/point/config/upload" />
+      </template>
+    </data-form>
   </div>
 </template>
 
@@ -10,7 +14,7 @@ const { mapActions: config } = createNamespacedHelpers('config');
 export default {
   name: 'index',
   props: {},
-  components: {},
+  components: { editor: () => import('@/components/editor.vue') },
   data: function () {
     return {
       fields: [
@@ -19,6 +23,7 @@ export default {
         { label: '购物赠送积分', model: 'buyPoint', type: 'number' },
         { label: '积分计划', model: 'pointPlan' },
         { label: '分享图片', model: 'share', type: 'upload', limit: 1, url: '/files/point/config/upload' },
+        { label: '用户协议', model: 'agree', custom: true },
       ],
       rules: {},
       form: {},

+ 4 - 0
src/views/platmanag/order/parts/card-2.vue

@@ -44,6 +44,7 @@ export default {
         { label: '顾客', model: 'customer.name' },
         { label: '店铺名称', model: 'shop.name' },
         { label: '支付金额', model: 'real_pay' },
+        { label: '是否售后', model: 'is_afterSale', format: (i) => (i === true ? '该订单有商品申请售后' : '未申请售后') },
       ],
       // 多选值
       selected: [],
@@ -71,6 +72,9 @@ export default {
         this.$set(this, 'total', res.total);
       }
     },
+    getTags(data) {
+      console.log(data);
+    },
     // 详情
     toDetail({ data }) {
       this.$router.push({ path: '/platmanag/order/detail_orderDetail', query: { id: data._id } });

+ 16 - 20
src/views/platmanag/storeAcc/detail.vue

@@ -21,18 +21,12 @@
         </el-col>
         <el-col :span="24">
           <data-form :fields="infoFields" :rules="rules" v-model="form" labelWidth="150px" @save="toSave">
-            <template #tags="{ item }">
-              <el-cascader v-model="form[item.model]" :options="tagsList" :props="props" clearable filterable :show-all-levels="false"></el-cascader>
-            </template>
             <template #act_tags>
               <el-option v-for="i in act_tagsList" :key="i.value" :label="i.label" :value="i.value"></el-option>
             </template>
             <template #status>
               <el-option v-for="i in goodsStatusList" :key="i.value" :label="i.label" :value="i.value"></el-option>
             </template>
-            <template #brief>
-              <editor v-model="form.brief" url="/files/point/goods/upload" />
-            </template>
           </data-form>
         </el-col>
       </el-row>
@@ -47,13 +41,14 @@ import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'index',
   props: {},
-  components: { editor: () => import('@/components/editor.vue') },
+  components: {},
   data: function () {
     return {
       view: 'list',
       fields: [
         { label: '姓名', model: 'name' },
         { label: '店铺名称', model: 'shop.name' },
+        { label: '电话', model: 'phone' },
         // { label: '商品分类', model: 'tags', format: (i) => this.getTags(i) },
         // { label: '活动标签', model: 'act_tags', format: (i) => this.getAct_tags(i) },
         // { label: '商品状态', model: 'status', format: (i) => this.getStatus(i) },
@@ -73,17 +68,18 @@ export default {
       limit: 10,
       // info部分
       infoFields: [
-        { label: '商品名称', model: 'name' },
-        { label: '商品分类', model: 'tags', custom: true },
-        { label: '活动标签', model: 'act_tags', type: 'selectMany' },
-        { label: '简短简介', model: 'shot_brief', maxLength: 50 },
-        { label: '预计发货时间', model: 'send_time' },
-        { label: '商品状态', model: 'status', type: 'select' },
-        { label: '商品来源', model: 'source' },
-        { label: '网址', model: 'url' },
-        { label: '排序', model: 'sort', type: 'number' },
-        { label: '商品图片', model: 'file', type: 'upload', url: '/files/point/goods/upload' },
-        { label: '商品介绍', model: 'brief', custom: true },
+        { label: '姓名', model: 'name' },
+        { label: '电话', model: 'phone' },
+        // { label: '商品分类', model: 'tags', custom: true },
+        // { label: '活动标签', model: 'act_tags', type: 'selectMany' },
+        // { label: '简短简介', model: 'shot_brief', maxLength: 50 },
+        // { label: '预计发货时间', model: 'send_time' },
+        // { label: '商品状态', model: 'status', type: 'select' },
+        // { label: '商品来源', model: 'source' },
+        // { label: '网址', model: 'url' },
+        // { label: '排序', model: 'sort', type: 'number' },
+        // { label: '商品图片', model: 'file', type: 'upload', url: '/files/point/goods/upload' },
+        // { label: '商品介绍', model: 'brief', custom: true },
       ],
       rules: {},
       form: {},
@@ -113,8 +109,8 @@ export default {
     },
     initAddData() {
       const obj = {
-        status: '1',
-        shop: _.get(this.shop, '_id'),
+        // status: '1',
+        // shop: _.get(this.shop, '_id'),
       };
       this.$set(this, 'form', obj);
     },

+ 1 - 0
src/views/platmanag/storeAcc/index.vue

@@ -42,6 +42,7 @@ export default {
       // 列表
       opera: [{ label: '账号管理', method: 'manage' }],
       fields: [
+        { label: '店铺编号', model: 'code' },
         { label: '店铺名称', model: 'name' },
         { label: '店主', model: 'person' },
         { label: '联系电话', model: 'phone' },

+ 2 - 2
src/views/platmanag/storeAcc/parts/search-1.vue

@@ -4,8 +4,8 @@
       <el-col :span="24" class="main">
         <el-form :model="form" ref="form" label-width="130px">
           <el-col :span="6">
-            <el-form-item label="名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入名称" size="small"></el-input>
+            <el-form-item label="店铺名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入店铺名称" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24" class="btn">