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

src/components/Buying/AdManageList.vue

+<style>
+  .height_auto.el-select .el-input {
+    height: auto
+  }
+
+</style>
+<template>
+  <div class="flexOne">
+    <div class="clearfix"></div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <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.AdImage}}</td>
+        <td>{{item.AdLink}}</td>
+        <td>{{item.Status}}</td>
+        <td>
+          <el-button-group>
+            <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
+              <el-button type="primary" size="mini" icon="el-icon-edit" @click="getAdManage(item.Id)">
+              </el-button>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+              <el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="removeAdManage(item.Id)"></el-button>
+            </el-tooltip>
+          </el-button-group>
+        </td>
+      </tr>
+    </table>
+    <div class="noDataNotice" v-if="dataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t("active.ld_noData")}}</p>
+    </div>
+  </div>
+</template>
+<script>
+  import {
+    get
+  } from 'http';
+  export default {
+    data() {
+      return {
+        //查询参数
+        msg: {},
+        addMsg: {
+          Id: 0, //编号
+          AdImage: "", //广告图片
+          AdLink: "", //广告链接
+        },
+        loading: false,
+        dataList: [],
+      };
+    },
+
+    mounted() {
+      this.getList();
+    },
+    filters: {},
+
+    methods: {
+      //获取数据
+      getList() {
+        this.loading = true;
+        this.apipost("ShopAd_get_GetAdManageListService", this.msg, res => {
+          this.loading = false;
+          if (res.data.resultCode === 1) {
+            this.dataList = res.data.data;
+          } else {
+            this.Error(res.data.message)
+          }
+        }, null);
+      },
+      //添加修改广告
+      SetAdmanage() {
+        this.apipost("ShopAd_post_SetAdManageService", this.addMsg, res => {
+          if (res.data.resultCode === 1) {
+            this.getList();
+          } else {
+            this.Error(res.data.message)
+          }
+        }, null);
+
+      },
+      //根据编号获取广告详情
+      getAdManage(Id) {
+        this.apipost("ShopAd_get_GetAdManageService", {
+          Id: Id
+        }, res => {
+          if (res.data.resultCode === 1) {
+            this.addMsg = res.data.data;
+          } else {
+            this.Error(res.data.message)
+          }
+        }, null);
+      },
+      //根据编号删除广告详情
+      removeAdManage(Id) {
+        this.apipost("ShopAd_post_RemoveAdManageService", {
+          Id: Id
+        }, res => {
+          if (res.data.resultCode === 1) {
+            this.getList();
+          } else {
+            this.Error(res.data.message)
+          }
+        }, null);
+      },
+    }
+  };
+
+</script>

src/components/Buying/GuestAccountList.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="1"></el-option>
+              <el-option label="上架" :value="2"></el-option>
+              <el-option label="下架" :value="3"></el-option>
+              <el-option label="取消" :value="4"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
+          <input type="button" @click="addIntegralMall('BuyingAdd')" 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.CostPrice}}</td>
+         <td>{{item.SellPrice}}</td>
+         <td>{{item.LeaderRebate}}</td>
+         <td>{{item.CompanyRebate}}</td>
+         <td>{{item.ClientRebate}}</td>
+         <td>{{item.WeiTuRebate}}</td>
+         <td>
+          <el-button-group>
+            <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
+              <el-button type="primary" size="mini" icon="el-icon-edit" @click="addIntegralMall('BuyingAdd', item.Id, '修改商品')"></el-button>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="上架" placement="top">
+              <el-button type="success" size="mini" class="iconfont icon-shangjia1"></el-button>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="下架" placement="top">
+              <el-button type="warning" size="mini" class="iconfont icon-xiajia1"></el-button>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="取消" placement="top">
+              <el-button type="danger" size="mini" class="iconfont icon-quxiao1"></el-button>
+            </el-tooltip>
+          </el-button-group>
+         </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: [],
+      total:0,
+      CommodityTypeList: [],
+    };
+  },
+  
+  mounted() {
+    this.getList();
+    this.getCommodityTypeList();
+    this.getGoodsTypeManager();
+  },
+  filters: {
+  },
+
+  methods: {
+    handleCurrentChange(val){
+      this.msg.pageIndex=val;
+      this.getList();
+    },
+    addIntegralMall: function( path, proId, tab){
+      this.$router.push({ name: path,query:{blank: 'y', proId: proId, 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