积分商品

src/views/his/integralGoods/index.vue

@@ -228,6 +228,23 @@
         <el-form-item label="库存" prop="stock">
           <el-input-number v-model="form.stock"  :min="0"  label="库存"></el-input-number>
         </el-form-item>
+        <el-form-item label="运费模板" prop="tempId">
+          <el-select
+            style="width: 240px"
+            v-model="form.tempId"
+            filterable
+            clearable
+            placeholder="请选择运费模板"
+            size="small"
+          >
+            <el-option
+              v-for="(item, index) in templateList"
+              :key="index"
+              :value="item.id"
+              :label="item.name"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.status">
             <el-radio
@@ -327,6 +344,7 @@ import Editor from '@/components/Editor/wang';
 import { getToken } from "@/utils/auth";
 import integralGoodsDetails from '../../components/his/integralGoodsDetails';
 import { list as getAppMallOptions } from '@/api/course/coursePlaySourceConfig'
+import { getAllShippingTemplates } from "@/api/hisStore/shippingTemplates";
 export default {
   name: "IntegralGoods",
   components: {Material,Editor,integralGoodsDetails},
@@ -345,6 +363,7 @@ export default {
       visibleScopeArr: ['app', 'mini'],
       // 小程序列表
       appMallOptions:[],
+      templateList: [],
 
       show:{
               open:false,
@@ -454,6 +473,7 @@ export default {
 
     // 查询小程序
     this.getAppMallOptions();
+    this.loadShippingTemplates();
 
     this.getList();
     this.getDicts("sys_integral_goods_type").then(response => {
@@ -464,6 +484,11 @@ export default {
     });
   },
   methods: {
+    loadShippingTemplates() {
+      getAllShippingTemplates().then(response => {
+        this.templateList = response.data || [];
+      });
+    },
 
     getAppMallOptions() {
       getAppMallOptions({pageNum:1,pageSize:100}).then(response => {
@@ -537,7 +562,8 @@ export default {
         stock: null,
         descs: null,
         createTime: null,
-        visibleScope: 'app,mini'
+        visibleScope: 'app,mini',
+        tempId: null
       };
       this.appIds = [];
       this.visibleScopeArr = ['app', 'mini'];

src/views/hisStore/integralGoods/index.vue

@@ -231,6 +231,23 @@
         <el-form-item label="库存" prop="stock">
           <el-input-number v-model="form.stock"  :min="0"  label="库存"></el-input-number>
         </el-form-item>
+        <el-form-item label="运费模板" prop="tempId">
+          <el-select
+            style="width: 240px"
+            v-model="form.tempId"
+            filterable
+            clearable
+            placeholder="请选择运费模板"
+            size="small"
+          >
+            <el-option
+              v-for="(item, index) in templateList"
+              :key="index"
+              :value="item.id"
+              :label="item.name"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="可见范围" prop="visibleScopeArr">
           <el-select style="width: 240px" v-model="visibleScopeArr" placeholder="请选择可见范围" size="small" multiple>
             <el-option label="APP" value="app" />
@@ -308,6 +325,7 @@ import Editor from '@/components/Editor/wang';
 import { getToken } from "@/utils/auth";
 import integralGoodsDetails from '../components/integralGoodsDetails';
 import { list as getAppMallOptions } from '@/api/course/coursePlaySourceConfig'
+import { getAllShippingTemplates } from "@/api/hisStore/shippingTemplates";
 export default {
   name: "HisIntegralGoods",
   components: {Material,Editor,integralGoodsDetails},
@@ -326,6 +344,7 @@ export default {
       visibleScopeArr: ['app', 'mini'],
       // 小程序列表
       appMallOptions:[],
+      templateList: [],
 
       show:{
               open:false,
@@ -399,6 +418,7 @@ export default {
 
     // 查询小程序
     this.getAppMallOptions();
+    this.loadShippingTemplates();
 
     this.getDicts("sys_integral_goods_type").then(response => {
       this.goodsTypeOptions = response.data;
@@ -408,6 +428,11 @@ export default {
     });
   },
   methods: {
+    loadShippingTemplates() {
+      getAllShippingTemplates().then(response => {
+        this.templateList = response.data || [];
+      });
+    },
     formatVisibleScope(visibleScope) {
       if (!visibleScope) {
         return 'APP、小程序';
@@ -486,7 +511,8 @@ export default {
         stock: null,
         descs: null,
         createTime: null,
-        visibleScope: 'app,mini'
+        visibleScope: 'app,mini',
+        tempId: null
       };
       this.imageArr = [];
       this.photoArr = [];

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -134,6 +134,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="商品分类" prop="cateName">
+        <el-input
+          v-model="queryParams.cateName"
+          clearable
+          placeholder="请输入商品分类"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="微信昵称" prop="nickname">
+        <el-input
+          v-model="queryParams.nickname"
+          clearable
+          placeholder="请输入微信昵称"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="订单类型" prop="orderType">
         <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable size="small">
           <el-option label="商城订单" value="0" />
@@ -463,7 +481,7 @@
       <el-table-column label="所属公司" align="center" prop="companyName" min-width="140" show-overflow-tooltip />
       <el-table-column label="所属员工" align="center" prop="companyUserNickName" width="120" show-overflow-tooltip />
       <el-table-column label="小程序名称" align="center" prop="miniProgramName"/>
-      <el-table-column label="用户昵称" align="center" prop="nickname" width="150px" >
+      <el-table-column label="微信昵称" align="center" prop="userNickName" width="150px" >
         <template slot-scope="scope">
           <span>{{scope.row.userNickName}} </span>
         </template>
@@ -512,7 +530,7 @@
        <el-table-column label="实付金额" align="center" prop="payMoney"  v-if="showFinanceTableField"/>
       <el-table-column label="额外运费" align="center" prop="payPostage" v-if="showFinanceTableField"/>
       <el-table-column label="商品编码" align="center" prop="barCode"  v-if="showFinanceTableField"/>
-      <el-table-column label="商品分类" align="center" prop="cateName" v-if="showFinanceTableField"/>
+      <el-table-column label="商品分类" align="center" prop="cateName" width="120px"/>
       <el-table-column align="center" label="下单时间" prop="createTime"/>
       <!-- <el-table-column label="支付状态" align="center" prop="paid" /> -->
       <el-table-column align="center" label="支付时间" prop="payTime" width="180">
@@ -1119,6 +1137,8 @@ export default {
         { key: 'payType', label: '支付方式', checked: true },
         { key: 'status', label: '订单状态', checked: true },
         { key: 'barCode', label: '商品编码', checked: false },
+        { key: 'cateName', label: '商品分类', checked: false },
+        { key: 'userNickName', label: '微信昵称', checked: false },
 
 
         { key: 'deliverySn', label: '快递公司编号', checked: false },
@@ -1249,6 +1269,8 @@ export default {
         companyId: null,
         companyUserNickName: null,
         productName: null,
+        cateName: null,
+        nickname: null,
         payCode: null,
         orderType: null
 

src/views/hisStore/storeOrder/index.vue

@@ -110,6 +110,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="商品分类" prop="cateName">
+        <el-input
+          v-model="queryParams.cateName"
+          placeholder="请输入商品分类"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="微信昵称" prop="nickname">
+        <el-input
+          v-model="queryParams.nickname"
+          placeholder="请输入微信昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
       <el-form-item label="手机号" prop="userPhone">
         <el-input
@@ -480,7 +498,7 @@
           </template>
         </el-table-column>
       <el-table-column label="小程序名称" width="120px" align="center" prop="miniProgramName"/>
-      <el-table-column label="用户昵称" align="center" prop="nickname" width="150px" >
+      <el-table-column label="微信昵称" align="center" prop="userNickName" width="150px" >
           <template slot-scope="scope">
               <span>{{scope.row.userNickName}} </span>
           </template>
@@ -517,7 +535,7 @@
       <!-- <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/> -->
       <el-table-column label="额外运费" align="center" prop="payPostage" v-if="showFinanceTableField"/>
       <el-table-column label="商品编码" align="center" prop="barCode"  v-if="showFinanceTableField"/>
-      <el-table-column label="商品分类" align="center" prop="cateName" v-if="showFinanceTableField"/>
+      <el-table-column label="商品分类" align="center" prop="cateName" width="120px"/>
        <!-- <el-table-column label="应付金额" align="center" prop="payPrice" >
           <template slot-scope="scope">
               <span v-if="scope.row.payPrice!=null">{{scope.row.payPrice.toFixed(2)}}</span>
@@ -1212,6 +1230,8 @@ export default {
         { key: 'payType', label: '支付方式', checked: true },
         { key: 'status', label: '订单状态', checked: true },
         { key: 'barCode', label: '商品编码', checked: false },
+        { key: 'cateName', label: '商品分类', checked: false },
+        { key: 'userNickName', label: '微信昵称', checked: false },
 
 
         { key: 'deliverySn', label: '快递公司编号', checked: false },
@@ -1219,7 +1239,6 @@ export default {
         { key: 'deliveryId', label: '快递单号', checked: false },
         { key: 'remark', label: '备注', checked: false },
         { key: 'isAudit', label: '是否审核', checked: false },
-        { key: 'userNickName', label: '用户昵称', checked: false },
         { key: 'orderRemark', label: '订单备注', checked: false },
         { key: 'reasonValue1', label: '售后原因一级', checked: false },
         { key: 'reasonValue2', label: '售后原因二级', checked: false },
@@ -1348,6 +1367,8 @@ export default {
         deptId:null,
         isUpload:null,
         productName:null,
+        cateName:null,
+        nickname:null,
         isAudit:null,
       },
       // 表单参数

src/views/system/config/integralConfig.vue

@@ -81,6 +81,20 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item  label="分享首页视频积分" prop="integralShareHomeVideo">
+            <el-tooltip class="item" effect="dark" content="分享首页视频单次赠送积分" placement="top-end">
+              <el-input-number v-model="form11.integralShareHomeVideo" />
+            </el-tooltip>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="分享首页视频单日上限" prop="integralShareHomeVideoDailyLimit">
+            <el-input-number v-model="form11.integralShareHomeVideoDailyLimit" :min="1" />
+          </el-form-item>
+        </el-col>
+      </el-row>
 
       <el-row>
         <el-col :span="12">
@@ -146,10 +160,17 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item  label="点播课留言积分" prop="integralComment">
+          <el-form-item  label="完课评价积分(非转化素材)" prop="integralComment">
             <el-input-number v-model="form11.integralComment" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item  label="完课评价积分(转化素材)" prop="integralCommentProduct">
+            <el-input-number v-model="form11.integralCommentProduct" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="12">
           <el-form-item  label="积分有效天数" prop="integralExpireDays">
             <el-input-number v-model="form11.integralExpireDays" />
@@ -279,6 +300,7 @@ const DEFAULT_TASK_DISPLAY_ROWS = [
   { code: 'DOWNLOAD_APP', name: '首次下载APP', typeLabel: '新手', defaultScopes: ['app'], tip: '仅 APP 端可完成' },
   { code: 'FIRST_PURCHASE', name: '首次完成购物', typeLabel: '新手', defaultScopes: ['app', 'mini'], tip: '全渠道首购奖励' },
   { code: 'SHARE', name: '分享得积分', typeLabel: '每日', defaultScopes: ['app', 'mini'], tip: 'APP+小程序合计日限' },
+  { code: 'SHARE_HOME_VIDEO', name: '分享首页视频', typeLabel: '每日', defaultScopes: ['app', 'mini'], tip: '分享首页视频，默认每日5次' },
   { code: 'COURSE', name: '学习首页课程', typeLabel: '每日', defaultScopes: ['app'], tip: '默认仅 APP 展示' },
   { code: 'BROWSE_MALL', name: '浏览商城60秒', typeLabel: '每日', defaultScopes: ['app', 'mini'], tip: '浏览商城任务' },
   { code: 'INVITE', name: '邀好友享积分', typeLabel: '每日', defaultScopes: ['app', 'mini'], tip: '邀请新用户' },
@@ -316,6 +338,7 @@ export default {
         integralNewTask: null,
         integralRatio: null,
         integralShare: null,
+        integralShareHomeVideo: 10,
         integralFollow: null,
         integralCourse: null,
         integralProduct: null,
@@ -329,10 +352,12 @@ export default {
         integralFirstPurchase: 20,
         integralInviteDailyLimit: 3,
         integralShareDailyLimit: 5,
+        integralShareHomeVideoDailyLimit: 5,
         integralCourseDailyLimit: 5,
         integralProductDailyLimit: 1,
         integralProductBrowseSeconds: 60,
         integralComment: 100,
+        integralCommentProduct: 150,
         integralExpireDays: 90,
         integralExpireLaunchDate: null,
         taskDisplayScope: {},
@@ -416,10 +441,13 @@ export default {
           integralFirstPurchase: 20,
           integralInviteDailyLimit: 3,
           integralShareDailyLimit: 5,
+          integralShareHomeVideo: 10,
+          integralShareHomeVideoDailyLimit: 5,
           integralCourseDailyLimit: 5,
           integralProductDailyLimit: 1,
           integralProductBrowseSeconds: 60,
           integralComment: 100,
+          integralCommentProduct: 150,
           integralExpireDays: 90,
           taskDisplayScope: {},
           logTypeDisplayScope: {}