Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/HotelPrice.vue

@@ -708,7 +708,7 @@ export default {
     },
     isdelete(ID) {
       var that = this;
-      that.Confirm(this.$t('tips.shifoushanchu'), function() {
+      that.Confirm(that.$t('tips.shifoushanchu'), function() {
         that.apipost(
           "dict_post_HotelOffer_Remove",
           {
@@ -718,7 +718,7 @@ export default {
             if (res.data.resultCode == 1) {
               that.initDataTable();
               that.initCalendar();
-              that.Success(this.$t('tips.shanchuchenggong'));
+              that.Success(that.$t('tips.shanchuchenggong'));
             }
           }
         );

src/components/LeaderManagement/leaderArrangement.vue

@@ -718,7 +718,7 @@
               this.Success(this.$t("ground.shezhichenggong"));
               this.isShow = false;
             } else {
-              that.Confirm(this.$t('ground.sheizhichongtu'), function () {
+              that.Confirm(that.$t('ground.sheizhichongtu'), function () {
                 that.addMsg.IsSure = 1;
                 that.apipost(
                   "LeaderSchedule_post_Set",
@@ -727,7 +727,7 @@
                     if (res.data.resultCode == 1) {
                       that.getList();
                       that.getNoTaskLeader();
-                      that.Success(this.$t("ground.shezhichenggong"));
+                      that.Success(that.$t("ground.shezhichenggong"));
                       that.isShow = false;
                     }
                   },
@@ -748,7 +748,7 @@
           };
           that.apipost("LeaderSchedule_Post_Remove", msg, res => {
             if (res.data.resultCode == 1) {
-              that.Success(this.$t('ground.quxiaochenggong'));
+              that.Success(that.$t('ground.quxiaochenggong'));
               that.getList();
             } else {
               that.Error(res.data.message);

src/components/activity/BuyingList.vue

+<style>
+.height_auto.el-select .el-input{
+  height: auto
+}
+</style>
+
+<template>
+  <div class="flexOne">
+    <div class="query-box">
+      <ul class="user_time_picker">
+        <li>
+          <span>
+            <em>{{$t('MarketingActi.commName')}}</em>
+            <el-input v-model="msg.name" @keyup.enter.native="getList"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>商品类型</em>
+            <el-select filterable v-model="msg.SellType">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0" key="0"></el-option>
+              <el-option v-for="item in CommodityTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>商品分类</em>
+            <el-select filterable v-model="msg.CategoryId">
+              <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
+              <el-option v-for="item in GoodsTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('admin.admin_status')}}</em>
+            <el-select filterable v-model="msg.Status">
+              <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
+              <el-option label="展示" :value="0"></el-option>
+              <el-option label="不展示" :value="1"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
+          <input type="button" @click="addIntegralMall('addIntegralMall', '', $t('MarketingActi.addComm'))" class="normalBtn" :value="$t('pub.addBtn')">
+        </li>
+      </ul>
+    </div>
+
+    <div class="clearfix"></div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th width='80'>{{$t('MarketingActi.commNum')}}</th>
+        <th>{{$t('MarketingActi.commName')}}</th>
+        <th>分类名称</th>
+        <th>类型名称</th>
+        <th>成本价</th>
+        <th>销售价</th>
+        <th>领队返佣</th>
+        <th>公司返佣</th>
+        <th>同行返佣</th>
+        <th>微途返佣</th>
+        <th>{{$t('system.table_operation')}}</th>
+      </tr>
+      <tr v-for="item in dataList">
+         <td>{{item.Id}}</td>
+         <td>{{item.Name}}</td>
+         <td>{{item.CategoryName}}</td>
+         <td>{{item.SellTypeName}}</td>
+         <td>{{item.price}}{{item.priceUnit === 1 ? '人民币' : '积分'}}</td>
+         <td>{{item.marketPrice}}</td>
+         <td>{{item.quota === 0 ? '不限购' : `限购${item.quota}次`}}</td>
+         <td>{{item.logistic}}</td>
+         <td>{{getHotName(item.ishot)}}</td>
+         <td>{{item.state === 1 ? '上架' : item.state === 0 ? '下架' : '删除'}}</td>
+         <td>
+            <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
+                <el-button
+                type="primary"
+                icon="el-icon-edit"
+                circle
+                @click="addIntegralMall('addIntegralMall', item, '修改商品')"
+                ></el-button>
+            </el-tooltip>
+         </td>
+      </tr>
+    </table>
+    <el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
+		</el-pagination>
+    <div class="noDataNotice" v-if="dataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t("active.ld_noData")}}</p>
+    </div>
+</div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      //请求
+      msg: {
+        pageSize: 15,
+        pageIndex: 1,
+        SellType: 0,
+        Name: '',
+        CategoryId: -1,
+        Status: -1
+      },
+      loading:false,
+      dataList:[],
+      GoodsTypeList: [],
+      GoodsSeriesList: [],
+      total:0,
+      CommodityTypeList: [],
+    };
+  },
+  
+  mounted() {
+    this.getList();
+    this.getGoodsSeries();
+    this.getCommodityTypeList();
+    this.getGoodsTypeManager();
+  },
+  filters: {
+  },
+
+  methods: {
+    handleCurrentChange(val){
+      this.msg.pageIndex=val;
+      this.getList();
+    },
+    getHotName: function (id) {
+      for(let i = 0; i < this.GoodsSeriesList.length; i++ ) {
+        if (this.GoodsSeriesList[i].id === id) {
+          return this.GoodsSeriesList[i].name
+        }
+      }
+      return '无'
+    },
+    getGoodsSeries() {
+      this.loading = true;
+      this.apiJavaPost(
+        "/api/IntegralManager/getGoodsSeries",
+        {},
+        res => {
+          this.loading = false;
+          if (res.data.resultCode === 1) {
+            this.GoodsSeriesList = res.data.data;
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    addIntegralMall: function( path, obj, tab){
+      localStorage.editIntegralMall = JSON.stringify(obj);
+      this.$router.push({ name: path,query:{blank: 'y', tab: tab} })
+    },
+    getGoodsTypeManager() {
+      this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: 0},res => {
+          if (res.data.resultCode === 1) {
+            this.GoodsTypeList = res.data.data; 
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    getCommodityTypeList() {
+      this.apipost(
+        "Shop_post_GetCommodityTypeList",
+        {},
+        res => {
+          if (res.data.resultCode === 1) {
+            this.CommodityTypeList = res.data.data; 
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    //获取数据
+    getList() {
+      this.loading = true;
+      this.apipost("Shop_post_GetPageList", this.msg, res => {
+        this.loading = false;
+        if (res.data.resultCode === 1) {
+          this.dataList = res.data.data.pageData;
+          this.total= res.data.data.count;
+        } else {
+          this.Error(res.data.message)
+        }
+      }, null);
+    },
+   }
+};
+</script>
\ No newline at end of file

src/router/config.js

@@ -3950,7 +3950,22 @@ export default {
                                 title: '商品类型'
                             }
                         },
-
+                        {
+                            path: '/BuyingType',
+                            name: 'BuyingType',
+                            component: resolve => require(['@/components/activity/BuyingType'], resolve),
+                            meta: {
+                                title: '代购商品类型'
+                            }
+                        },
+                        {
+                            path: '/BuyingList',
+                            name: 'BuyingList',
+                            component: resolve => require(['@/components/activity/BuyingList'], resolve),
+                            meta: {
+                                title: '代购商品列表'
+                            }
+                        },
                         {
                             path: '/IntegralMall',
                             name: 'IntegralMall',