Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/assets/css/common.css

@@ -112,8 +112,8 @@
 }
 .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .searchInput{
     line-height: normal;

src/components/CommodityMan/addGoodsClass.vue

@@ -360,8 +360,8 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
 }
 .addGoodsClass .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .addGoodsClass .searchInput{
     line-height: normal;

src/components/CommodityMan/goodsClassification.vue

@@ -874,8 +874,8 @@ export default {
 }
 .goodsClass .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .goodsClass .searchInput{
     line-height: normal;

src/components/CommodityMan/goodsList.vue

@@ -30,7 +30,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期">
             </el-date-picker>
-            <div class="searchInput" style="width:250px">
+            <div class="searchInput" style="width:250px;margin-right: 0px;">
                 <el-input @keyup.enter.native="getList()" style="display:inline-block;width:225px;height:30px"
                 placeholder="请输入名称搜索"
                 v-model="msg.Name"
@@ -40,6 +40,16 @@
                 </el-input>
                 <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
             </div>
+            <div class="searchInput" style="width:250px">
+                <el-input @keyup.enter.native="getList()" style="display:inline-block;width:225px;height:30px"
+                placeholder="请输入ID搜索"
+                v-model="msg.Id"
+                @clear="getList"
+                size="small"
+                clearable>
+                </el-input>
+                <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
+            </div>
             <span @click="Clearconditions" v-if="msg.Name!='' || msg.CategoryIds!='' || (dateList && dateList.length>0)" class='blue point'>清空筛选条件</span>
         </div>
         <div style="margin-top:15px">
@@ -75,7 +85,7 @@
                         <img @click="scope.row.editsort=true,scope.row.SortNew=scope.row.Sort" style="width:15px;height:15px;margin-left:7px" src="../../assets/img/userman/edit1.png" alt="">
                     </template>
                     <template v-else>
-                        <el-input v-model="scope.row.SortNew" type="number" min="1" size="small" style="display:inline-block;width:80px"></el-input>
+                        <el-input v-model="scope.row.SortNew" type="number" min="1" size="small" style="display:inline-block;width:70px"></el-input>
                         <span @click="scope.row.editsort=false" class="el-icon-error" style="color: rgb(245, 108, 108);"></span>
                         <span @click="Edit(scope.row,1)" class="el-icon-success" style="color:#67c23a"></span>
                     </template>
@@ -387,7 +397,7 @@ export default {
                 GoodsStatus:0,
                 IsSelectSellOut:0,
                 CategoryIds:'',
-                Id:0,
+                Id:'',
                 StartTime:'',
                 EndTime:'',
             },
@@ -666,6 +676,7 @@ export default {
             this.getList();
         },
         getList(){
+            
             if(this.dateList && this.dateList.length>0){
                 this.msg.StartTime=this.dateList[0];
                 this.msg.EndTime=this.dateList[1];
@@ -673,8 +684,12 @@ export default {
                 this.msg.StartTime='';
                 this.msg.EndTime='';
             }
+            let msg=JSON.parse(JSON.stringify(this.msg))
+            if(msg.Id==''){
+                msg.Id=0;
+            }
             this.loading=true;
-            this.apipost("/api/product/GetProductGoodsPageList", this.msg, res => {
+            this.apipost("/api/product/GetProductGoodsPageList", msg, res => {
                 this.loading=false;
                 if(res.data.resultCode==1){
                     this.total=res.data.data.count;

src/components/CommodityMan/goodsListEdit.vue

-<template>
+<template>
   <div class="goodsListEdit">
     <div class="head-title">
       <span @click="CommonJump('goodsList')" class="blue point">商品列表</span>
@@ -874,7 +874,7 @@
                             type="info"
                             style="margin:5px"
                           >
-                            {{ item.Name }}</el-tag
+                            {{ item.AreaName }}</el-tag
                           >
                         </div>
                       </div>
@@ -965,7 +965,7 @@
                     >
                       <template slot="prepend">最多抵扣</template>
                       <el-button slot="append">
-                        分
+                        元
                         <el-radio
                           v-model="addMsg.PointsDeductionType"
                           :label="2"
@@ -2232,7 +2232,7 @@ export default {
         Id: 0,
         Image: "",
         Name: "",
-        Sort: item.SpecificationValueList.length
+        Sort: item.SpecificationValueList.length+1
       };
       this.SpecificationList[index].SpecificationValueList.push(obj);
     },
@@ -2287,7 +2287,10 @@ export default {
       this.calcList(this.skuList, this.SpecificationList);
     },
     calcList(list, calist) {
+      
+      let oldArr=JSON.parse(JSON.stringify(this.SpecificationPriceList))
       this.SpecificationPriceList = [];
+      
       let arrList = [];
       list.forEach(item => {
         item.AttrList = [];
@@ -2311,21 +2314,36 @@ export default {
         });
       });
       list.forEach((item, i) => {
-        let obj = {
-          AttrList: item.AttrList,
-          SpecificationSort: item.SpecificationSort,
-          GoodsNumbers: item.GoodsNumbers,
-          GoodsWeight: item.GoodsWeight,
-          InventoryNum: item.InventoryNum,
-          SellingPrice: item.SellingPrice
-        };
+        let obj={};
+          obj = {
+            AttrList: item.AttrList,
+            SpecificationSort: item.SpecificationSort,
+            GoodsNumbers: item.GoodsNumbers,
+            GoodsWeight: item.GoodsWeight,
+            InventoryNum: item.InventoryNum,
+            SellingPrice: item.SellingPrice
+          };
+        oldArr.forEach(val=>{
+          if(val.SpecificationSort==item.SpecificationSort){
+           obj = {
+              AttrList: item.AttrList,
+              SpecificationSort: val.SpecificationSort,
+              GoodsNumbers: val.GoodsNumbers,
+              GoodsWeight: val.GoodsWeight,
+              InventoryNum: val.InventoryNum,
+              SellingPrice: val.SellingPrice
+            };
+          }
+          
+        })
+        this.SpecificationPriceList.push(obj);
         let obj1 = {
           Id: i,
           AttrList: item.AttrList,
           SpecificationSort: item.SpecificationSort,
           GradeCommissionList: []
         };
-        this.SpecificationPriceList.push(obj);
+        
         arrList.push(obj1);
       });
       this.calcdis(JSON.parse(JSON.stringify(arrList)));
@@ -2450,7 +2468,8 @@ export default {
       this.AreaList.forEach(item => {
         let obj = {
           Id: item.RegionId,
-          Name: item.RegionName
+          AreaId:item.RegionId,
+          AreaName: item.RegionName
         };
         this.addMsg.AreaList.push(obj);
       });
@@ -2507,15 +2526,16 @@ export default {
       this.imgType = val;
     },
     SelectId(msg) {
+      let that=this;
       if (this.imgType == 1) {
         let obj = {
           Id: msg.selectId,
-          Path: this.domainManager().ImageUrl + msg.url
+          Path:that.getIconLink(msg.url),
         };
         this.addMsg.CarouselImageList.push(obj);
       }
       if (this.imgType == 2) {
-        this.addMsg.CustomShareImage = this.domainManager().ImageUrl + msg.url;
+        this.addMsg.CustomShareImage = that.getIconLink(msg.url);
       }
       if (this.imgType == 3) {
         let imgListIndex1 = this.imgListIndex1;
@@ -2605,6 +2625,7 @@ export default {
         },
         res => {
           this.addMsg = res.data.data;
+          console.log("this.addMsg",this.addMsg)
           this.initShareSettings();
           this.SpecificationPriceList = this.addMsg.SpecificationPriceList;
           this.SpecificationList = this.addMsg.SpecificationList;

src/components/CommodityMan/goodsServices.vue

@@ -11,6 +11,7 @@
                 placeholder="请输入规格名搜索"
                 v-model="msg.Name"
                 @clear="getList"
+                @keyup.enter.native="getList()"
                 size="small"
                 clearable>
                 </el-input>
@@ -221,8 +222,8 @@ export default {
 }
 .quickBuy .content .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .quickBuy .content .searchInput{
     line-height: normal;

src/components/CommodityMan/materialMan.vue

@@ -240,7 +240,7 @@ export default {
             Type:1,
             Recycled:1,
             pageIndex:1,
-            pageSize:15,
+            pageSize:20,
             GroupId:0,
         },
         PageList:[],

src/components/CommodityMan/quickBuy.vue

@@ -286,8 +286,8 @@ export default {
 }
 .quickBuy .content .searchInput .el-input__inner{
     border:none;outline:none;
-    height: 30px;
-    line-height: 30px;
+    height: 30px!important;
+    line-height: 30px!important;
 }
 .quickBuy .content .searchInput{
     line-height: normal;

src/components/CommodityMan/supplierEdit.vue

+<template>
+  <div v-loading="pageloading" class="supplierEdit">
+    <div class="head-title">
+      <span @click="CommonJump('supplierManage')" class="blue point">供应商</span> / 供应商编辑
+    </div>
+    <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
+      <el-card shadow="never" style="margin-top:10px" class="box-card">
+        <el-form-item class="commonLabel discount" label="供应商名称" prop="Name">
+          <el-input v-model="addMsg.Name" style="width:690px" size="small">
+          </el-input>
+        </el-form-item>
+        <el-form-item class="commonLabel discount" label="电话" prop="Mobile">
+          <el-input v-model="addMsg.Mobile" style="width:690px" size="small" step="1"  min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''">
+          </el-input>
+        </el-form-item>
+        <el-form-item class="commonLabel discount" label="地址" >
+          <el-input v-model="addMsg.Address" style="width:690px" size="small">
+          </el-input>
+        </el-form-item>
+
+
+
+        <el-form-item class="commonLabel discount" label="账户分类" prop="ClientBankAccount.AccountClassify">
+          <el-select class="w150"  style="margin-right: 10px;" v-model="addMsg.ClientBankAccount.AccountClassify" size="small" placeholder="请选择" @change='changeTitle'>
+            <el-option
+              v-for="item in options"
+              :key="item.Id"
+              :label="item.Name"
+              :value="item.Id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item class="commonLabel discount" :label="nameA" prop="ClientBankAccount.OpenBankName" v-if="addMsg.ClientBankAccount.AccountClassify!=3 && addMsg.ClientBankAccount.AccountClassify!=4">
+          <el-input v-model="addMsg.ClientBankAccount.OpenBankName" style="width:690px" size="small">
+          </el-input>
+        </el-form-item>
+        <el-form-item class="commonLabel discount" :label="nameB" prop="ClientBankAccount.AccountHolder"  v-if='addMsg.ClientBankAccount.AccountClassify!=3 && addMsg.ClientBankAccount.AccountClassify!=4'>
+          <el-input v-model="addMsg.ClientBankAccount.AccountHolder" style="width:690px" size="small">
+          </el-input>
+        </el-form-item>
+        <el-form-item class="commonLabel discount" :label="nameC" prop="ClientBankAccount.CardNum" >
+          <el-input v-model="addMsg.ClientBankAccount.CardNum" style="width:690px" size="small" onkeyup="this.value= this.value.match(/\d+(\d{0,2})?/) ? this.value.match(/\d+(\d{0,2})?/)[0] : ''">
+          </el-input>
+        </el-form-item>
+        <el-form-item class="commonLabel discount" :label="nameD" prop="ClientBankAccount.AccountAlias">
+          <el-input v-model="addMsg.ClientBankAccount.AccountAlias" style="width:690px" size="small">
+          </el-input>
+        </el-form-item>
+
+
+
+      </el-card>
+    </el-form>
+    <div style="padding:20px;background:#fff;margin-top:10px">
+      <el-button @click="Save('addMsg')" size="small" type="primary">保存</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "supplierEdit",
+    data(){
+      return{
+        pageloading:false,
+        addMsg:{
+          ID:0,
+          Name:'',
+          Mobile:'',
+          Address:'',
+          ClientBankAccount:{
+            ID:0,
+            AccountClassify:2,
+            OpenBankName:'',
+            AccountHolder:'',
+            CardNum:'',
+            AccountAlias:'',
+          },
+
+        },
+        nameA:'开户支行',
+        nameB:'开户人',
+        nameC:'卡号',
+        nameD:'账户别名',
+
+        options:[
+          // {Id:1,Name:"平台"},
+          {Id:2,Name:"银行"},
+          {Id:3,Name:"虚拟账户"},
+          {Id:4,Name:"微信支付宝"},
+        ],
+        rules:{
+          Name: [
+            { required: true, message: '请输入供应商名称', trigger: 'blur' },
+          ],
+          Mobile: [
+            { required: true, message: '请输入电话', trigger: 'blur' },
+          ],
+
+         'ClientBankAccount.AccountClassify' : [
+            { required: true, message: '请输入服务名称', trigger: 'blur' },
+          ],
+          'ClientBankAccount.OpenBankName': [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          'ClientBankAccount.AccountHolder': [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          'ClientBankAccount.CardNum': [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          'ClientBankAccount.AccountAlias': [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+
+        },
+        supplierId:-1,
+      }
+    },
+    created(){
+      if(this.$route.query.supplierId){
+        this.supplierId=this.$route.query.supplierId;
+        this.getData()
+      }
+    },
+    methods:{
+      changeTitle(){
+        if(this.addMsg.ClientBankAccount.AccountClassify==3){
+            this.nameC='平台账户';
+            this.nameD='账户别名';
+
+        }else if(this.addMsg.ClientBankAccount.AccountClassify==4){
+          this.nameC='账号';
+          this.nameD='名称';
+        }
+        this.addMsg.ClientBankAccount.OpenBankName='';
+        this.addMsg.ClientBankAccount.AccountHolder='';
+        this.addMsg.ClientBankAccount.CardNum='';
+        this.addMsg.ClientBankAccount.AccountAlias='';
+      },
+      Save(formName){
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.apipost('/api/Supplier/SetSupplier',this.addMsg,
+              res => {
+                if (res.data.resultCode === 1) {
+                  this.CommonJump('supplierManage')
+                  this.Success(res.data.message)
+
+                } else {
+                  this.Error(res.data.message);
+                }
+              },
+              null
+            );
+          } else {
+            return false;
+          }
+        });
+      },
+      getData(){
+        this.pageloading=true;
+        this.apipost("/api/Supplier/GetSupplierDetail",{ID:this.supplierId}, res => {
+          this.pageloading=false;
+          if(res.data.resultCode==1){
+            let data = res.data.data
+            this.addMsg.ID = data.ID;
+            this.addMsg.Name = data.Name;
+            this.addMsg.Mobile = data.Mobile;
+            this.addMsg.Address = data.Address;
+            this.addMsg.ClientBankAccount.ID = data.ClientBankAccount.ID;
+            this.addMsg.ClientBankAccount.AccountClassify = data.ClientBankAccount.AccountClassify;
+            this.addMsg.ClientBankAccount.OpenBankName = data.ClientBankAccount.OpenBankName;
+            this.addMsg.ClientBankAccount.AccountHolder = data.ClientBankAccount.AccountHolder;
+            this.addMsg.ClientBankAccount.CardNum = data.ClientBankAccount.CardNum;
+            this.addMsg.ClientBankAccount.AccountAlias = data.ClientBankAccount.AccountAlias;
+
+
+
+          }else {
+            this.Error(res.data.message);
+          }
+        })
+      },
+    },
+  };
+</script>
+
+<style>
+  .supplierEdit .discount .el-form-item__label{
+    padding-right: 30px;
+  }
+  .supplierEdit .el-form-item .elzk{
+    position: absolute;
+    left: -25px;
+    top:12px;
+  }
+</style>

src/components/CommodityMan/supplierManage.vue

+<template>
+  <div class="supplierManage">
+    <div class="head-title">
+      供应商管理
+      <el-button @click="CommonJump('supplierEdit')" style="float:right;margin-top: -5px;margin-left:20px;" size="small" type="primary">新增供应商</el-button>
+    </div>
+    <div class="content">
+      <div>
+        <div class="searchInput" style="width:250px">
+          <el-input style="display:inline-block;width:225px;height:30px"
+                    placeholder="请输入规格名搜索"
+                    v-model="msg.Name"
+                    @keyup.enter.native="getList()"
+                    @clear="getList"
+                    size="small"
+                    clearable>
+          </el-input>
+          <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
+        </div>
+
+      </div>
+      <el-table
+        :data="tableData"
+        v-loading="loading"
+        border
+        style="width: 100%;margin:20px 0">
+        <el-table-column
+          prop="Name"
+          width="180"
+          label="供应商名称">
+        </el-table-column>
+        <el-table-column
+          prop="Mobile"
+          width="150"
+          label="电话">
+        </el-table-column>
+        <el-table-column
+          prop="Address"
+          label="地址">
+        </el-table-column>
+
+        <el-table-column
+          prop="OpenBankName"
+          width="200"
+          label="开户支行">
+        </el-table-column>
+        <el-table-column
+          prop="AccountHolder"
+          width="100"
+          label="开户人">
+        </el-table-column>
+        <el-table-column
+          prop="CardNum"
+          width="250"
+          label="卡号 ">
+        </el-table-column>
+        <el-table-column
+          prop="AccountAlias"
+          width="240"
+          label="账户别名">
+        </el-table-column>
+        <el-table-column
+          prop="AccountClassifyStr"
+          width="160"
+          label="账户分类">
+        </el-table-column>
+
+
+
+        <el-table-column
+          prop="address"
+          label="操作">
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+              <img @click="CommonJump('supplierEdit',{supplierId:scope.row.ID})" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/edit.png" alt="">
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+              <img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt="">
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination style="text-align:right"
+                     background
+                     @current-change="handleCurrentChange"
+                     :page-size="msg.pageSize"
+                     layout="prev, pager, next"
+                     :total="total">
+      </el-pagination>
+    </div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "supplierManage",
+    data(){
+      return{
+        editState:false,
+        msg:{
+          pageIndex:1,
+          pageSize:15,
+          Name:'',
+        },
+        total:0,
+        tableData:[],
+        loading:false,
+
+
+      }
+    },
+    created(){
+      this.getList();
+
+    },
+    methods:{
+      Delete(item){
+        let that=this;
+        that.$confirm('是否删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.apipost('/api/Supplier/DelDiscountCoupon',{Id:item.ID,BackId:item.BackId},
+            res => {
+              if (res.data.resultCode === 1) {
+                this.getList();
+                this.Success(res.data.message)
+
+              } else {
+                this.Error(res.data.message);
+              }
+            },
+            null
+          );
+        }).catch(() => {
+
+        });
+      },
+
+
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+      getList(){
+        this.loading=true;
+        this.apipost("/api/Supplier/GetSupplierList ", this.msg, res => {
+          this.loading=false;
+          if(res.data.resultCode==1){
+            this.total=res.data.data.count;
+            let pageData=res.data.data.pageData;
+            pageData.forEach(item=>{
+              item.SortNew=item.Sort;
+              item.editState=false;
+            })
+            this.tableData=pageData;
+          }
+
+        })
+      },
+    },
+  };
+</script>
+
+<style>
+
+  .supplierManage .content .searchInput{
+    border: 1px solid #DCDFE6;
+    border-radius: 4px;
+  }
+  .supplierManage .content .searchInput .el-input__inner{
+    border:none;outline:none;
+    height: 30px;
+    line-height: 30px;
+  }
+  .supplierManage .content .searchInput{
+    line-height: normal;
+    display: inline-table;
+    width: 100%;
+    border-collapse: separate;
+    border-spacing: 0;
+    width:250px;
+    margin-right: 20px;
+  }
+  .supplierManage .content{
+    background: #fff;
+    margin-top:10px;
+    padding: 20px;
+    box-sizing: border-box;
+  }
+</style>

src/components/Index.vue

@@ -100,8 +100,8 @@
               </el-table-column>
               <el-table-column prop="address" label="数据统计" width="155">
                 <template slot-scope="scope">
-                   <p>用户数：<span style="color:blue">{{scope.row.UserNum}}</span></p>
-                   <p>订单数：<span style="color:red">{{scope.row.OrderNum}}</span></p>
+                  <p>用户数：<span style="color:blue">{{scope.row.UserNum}}</span></p>
+                  <p>订单数：<span style="color:red">{{scope.row.OrderNum}}</span></p>
                 </template>
               </el-table-column>
               <el-table-column prop="EffectiveDateStr" label="有效期" width="170">
@@ -496,7 +496,7 @@
     methods: {
       //退出登录
       loginOut() {
-       let that = this;
+        let that = this;
         that.Confirm("确认要退出系统吗?", function () {
           localStorage.removeItem("mall_userInfo");
           location.href = '/';
@@ -731,9 +731,18 @@
             FIndex: 1
           }
         });
-      }
+      },
+      //修改版权
+      TestMiniApp() {
+        this.apipost("/api/Mall/GetHome", {
+      
+        }, res => {
+          console.log("Test",res.data);
+        })
+      },
     },
     mounted() {
+      this.TestMiniApp();
       this.init();
       this.getMiniPrograme();
       this.getRemoveMiniPrograme();

src/components/StoreDesign/AppletPublishing.vue

@@ -35,7 +35,7 @@
         </div>
         <el-button type="primary" size="small" @click="JumpDeploy" style="margin-top: 20px">可跳转小程序设置</el-button>
         <div style="text-align: center;">
-          <el-button type="primary" @click="active=1" >下一步</el-button>
+          <el-button type="primary" @click="updateSet" >下一步</el-button>
         </div>
 
       </div>
@@ -101,9 +101,10 @@
       </div>
     </el-dialog>
     <!--可跳转小程序设置-->
+    <!--TODO 不确定参数是否是这样-->
     <el-dialog title="小程序码" :visible.sync="rightshow" width="418px">
       <div style="text-align: center;">
-        <img src="" alt="" style="width: 200px;">
+        <img :src="getWeiXin" alt="" style="width: 200px;">
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="rightshow=false" >确定</el-button>
@@ -130,6 +131,7 @@
             getQRcode_load:false,
             upload_load:false,
             getLoginQRcode:'',
+            getWeiXin:'',
             previewQRcode:'',
             Version:'',
           }
@@ -173,6 +175,15 @@
             }
           })
         },
+        updateSet(){
+          this.apipost("/api/Publish/UpdateSetting", {}, res => {
+            if (res.data.resultCode == 1) {
+              this.active=1;
+            } else {
+              this.Info(res.data.message);
+            }
+          })
+        },
         getSignQRcode(){
           this.getQRcode_load = true
           this.apipost("/api/Publish/GetLoginAppletWeChat", {}, res => {
@@ -221,7 +232,14 @@
           // })
         },
         getApplet(){ //获取小程序的二维码
-          this.rightshow=true
+          this.rightshow=true;
+          this.apipost("/api/Publish/GetWeiXinShare", {}, res => {
+            if (res.data.resultCode == 1) {
+              this.getWeiXin = res.data.data;
+            } else {
+              this.Info(res.data.message);
+            }
+          })
         },
         UpdateLivePlayBtn(val){
           this.apipost("/api/Tenant/UpdateLivePlayerPlugin", {'LivePlayerPlugin':val}, res => {

src/components/StoreDesign/userCenter.vue

@@ -242,10 +242,6 @@
     margin-bottom: 18px;
   }
 
-  .UserCenter .mobile_menuList:last-child {
-    margin-bottom: 0;
-  }
-
   .UserCenter .mobile_menu_image {
     background-size: cover;
     background-position: center center;

src/components/StoreDesign/wexinappmsg.vue

@@ -120,7 +120,7 @@
         </div>
       </div>
       <el-button size="small" type="primary" @click="UpdateMallDistributionMsg()">保 存</el-button>
-      <el-button size="small" type="primary">生成测试二维码</el-button>
+      <!--<el-button size="small" type="primary">生成测试二维码</el-button>-->
     </template>
   </div>
 </template>

src/components/UserMan/MembersBuy.vue

@@ -18,6 +18,7 @@
             <div style="margin-left:20px" class="searchInput">
                 <el-input style="display:inline-block;width:225px;height:30px"
                 placeholder="请输入内容"
+                @keyup.enter.native="getList()"
                 v-model="msg.UserName"
                 size="small"
                 @clear="getList"

src/components/UserMan/MembershipGrade.vue

@@ -10,6 +10,8 @@
             <div class="searchInput">
                 <el-input style="display:inline-block;width:225px;height:30px"
                 placeholder="请输入会员名称搜索"
+                @keyup.enter.native="getList()" 
+                @clear="getList"
                 v-model="msg.Name"
                 size="small"
                 clearable>

src/components/UserMan/PdistributorLevel.vue

@@ -22,6 +22,8 @@
                 <el-input style="display:inline-block;width:205px;height:30px"
                 placeholder="请输入分销商等级名称查询"
                 v-model="msg.GradeName"
+                @keyup.enter.native="getList()" 
+                @clear="getList"
                 size="small"
                 clearable>
                 </el-input>

src/components/UserMan/PeaceDistribution.vue

@@ -21,6 +21,8 @@
             <div class="searchInput" style="width:230px">
                 <el-input style="display:inline-block;width:205px;height:30px"
                 placeholder="请输入名称查询"
+                @keyup.enter.native="getList()" 
+                @clear="getList"
                 v-model="msg.Name"
                 size="small"
                 clearable>

src/components/UserMan/distributionOrder.vue

@@ -72,7 +72,7 @@
                                     <span>{{item.UserName}}</span>
                                 </div>
                                 <div flex="dir:left wrap:wrap" class="app-order-offline">
-                                    <div class="express-send-box">
+                                    <div v-if="item.DeliveryMethodName && item.DeliveryMethodName!=''" class="express-send-box">
                                         <span class="el-tag el-tag--small el-tag--light">{{item.DeliveryMethodName}}</span> 
                                     </div>
                                     <el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
@@ -93,7 +93,7 @@
                         <div class="app-order-body">
                             <div class="goods-item" style="width: 55%;">
                                 <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods">
-                                    <img :src="domainManager().ImageUrl+list.CoverImagePath" class="goods-image">
+                                    <img :src="getIconLink(list.CoverImagePath)" class="goods-image">
                                     <div flex="dir:left">
                                         <div class="goods-info">
                                             <div class="goods-name">
@@ -171,7 +171,7 @@
                                     <div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}} 地址：{{item.ShoppingAddress}}</div>
                                 </div>
                             </div>
-                            <div v-if="item.Remark && item.Remark!=''" class="seller-remark">商家备注：{{item.Remark}}</div>
+                            <div v-if="item.ReRemark && item.ReRemark!=''" class="seller-remark">商家备注：{{item.ReRemark}}</div>
                         </div>
                     </el-card>
                     <el-card v-if="tableData.length==0" class="app-order-item" shadow="never">

src/components/UserMan/distributorLevel.vue

@@ -22,6 +22,8 @@
                 <el-input style="display:inline-block;width:205px;height:30px"
                 placeholder="请输入分销商等级名称查询"
                 v-model="msg.Name"
+                @keyup.enter.native="getList()" 
+                @clear="getList"
                 size="small"
                 clearable>
                 </el-input>

src/components/UserMan/distributors.vue

@@ -22,21 +22,21 @@
         </el-select>
         <div class="searchInput" style="width:150px">
           <el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入ID" v-model="msg.UserId"
-            size="small" clearable>
+            size="small" @keyup.enter.native="getList()" @clear="getList" clearable>
           </el-input>
           <span @click="getList" class="el-icon-search"
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
         </div>
         <div class="searchInput" style="width:150px">
           <el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入昵称" v-model="msg.NickName"
-            size="small" clearable>
+            size="small" @keyup.enter.native="getList()" @clear="getList" clearable>
           </el-input>
           <span @click="getList" class="el-icon-search"
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
         </div>
         <div class="searchInput" style="width:150px">
           <el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入手机号" v-model="msg.Moblie"
-            size="small" clearable>
+            size="small" @keyup.enter.native="getList()" @clear="getList" clearable>
           </el-input>
           <span @click="getList" class="el-icon-search"
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>

src/components/UserMan/usersList.vue

@@ -20,21 +20,21 @@
           </el-option>
         </el-select>
         <div class="searchInput" style="width:150px">
-          <el-input style="display:inline-block;width:125px;height:30px" placeholder="请输入ID" v-model="msg.Id"
+          <el-input @keyup.enter.native="getList()" @clear="getList" style="display:inline-block;width:125px;height:30px" placeholder="请输入ID" v-model="msg.Id"
             size="small" clearable>
           </el-input>
           <span @click="getList" class="el-icon-search"
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
         </div>
         <div class="searchInput" style="width:150px">
-          <el-input @clear="getList" style="display:inline-block;width:125px;height:30px" placeholder="请输入昵称" v-model="msg.Name"
+          <el-input @keyup.enter.native="getList()" @clear="getList" style="display:inline-block;width:125px;height:30px" placeholder="请输入昵称" v-model="msg.Name"
             size="small" clearable>
           </el-input>
           <span @click="getList" class="el-icon-search"
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
         </div>
         <div class="searchInput" style="width:150px">
-          <el-input @clear="getList" style="display:inline-block;width:125px;height:30px" placeholder="请输入手机号" v-model="msg.Moblie"
+          <el-input @keyup.enter.native="getList()" @clear="getList" style="display:inline-block;width:125px;height:30px" placeholder="请输入手机号" v-model="msg.Moblie"
             size="small" clearable>
           </el-input>
           <span @click="getList" class="el-icon-search"
@@ -42,7 +42,7 @@
         </div>
       </div>
       <el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
-        <el-table-column prop="Id" label="ID">
+        <el-table-column prop="Id" label="ID" width="100">
         </el-table-column>
         <el-table-column prop="address" width="280" label="头像">
           <template slot-scope="scope">
@@ -86,7 +86,7 @@
         </el-table-column>
         <el-table-column prop="name" label="积分">
           <template slot-scope="scope">
-            <span @click="CommonJump('IntegralRecord')" class="blue point">{{scope.row.Integral}}</span>
+            <span @click="CommonJump('IntegralRecord',{UserId:scope.row.Id})" class="blue point">{{scope.row.Integral}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="CreateDate" width="150" label="加入时间">

src/components/UserMan/usersListEdit.vue

@@ -152,6 +152,8 @@
           UserId: this.UserId
         }, res => {
           this.userInfo = res.data.data;
+          this.msg.Name = this.userInfo.SuperiorName;
+          this.getList();
         })
       },
     },

src/components/common/choiceArea.vue

@@ -91,11 +91,11 @@
               </div>
             </div>
             <div class="pic-list" :style="style" v-if="picList && picList.length > 0">
-              <template v-for="(item, index) in picList">
-                <div :style="item" :key="index">
+              <template v-for="(item, Subindex) in picList">
+                <div :style="item" :key="Subindex">
                   <img :src="item.pic_url" style="width: 100%;visibility: hidden;display: block;">
                 </div>
-                <img :src="item.pic_url" :key="index" style="width: 100%;visibility: hidden;display: block;">
+                <img :src="item.pic_url" :key="Subindex+1" style="width: 100%;visibility: hidden;display: block;">
               </template>
             </div>
             <div :style="style" flex="dir:left main:center cross:center" v-else>
@@ -199,7 +199,8 @@
       isLink: Boolean,
       picList: Array,
       max: Number,
-      mode: String
+      mode: String,
+      chooseType: String,
     },
     data() {
       return {
@@ -216,7 +217,7 @@
           defaultX: 0,
           defaultY: 0,
           is_close: false,
-          link: '',
+          link: [],
           open_type: ''
         },
         hotspotList: [],
@@ -232,9 +233,6 @@
       dialogVisible(oldVal, newVal) {
         this.hotspotList = JSON.parse(JSON.stringify(this.hotspotArray))
         this.index = -1;
-        if(this.hotspotList.length>0){
-          this.select(1);
-        }
       }
     },
     computed: {
@@ -245,9 +243,13 @@
         };
       },
       maxWidth() {
+        // var widthStr = this.width.replace("px", "");
+        // var tempWidth = parseFloat(widthStr);
         return parseFloat(this.width) - this.hotspotList[this.index].left;
       },
       maxHeight() {
+        //var heightStr = this.height.replace("px", "");
+        //var tempheight = parseFloat(heightStr);
         return parseFloat(this.height) - this.hotspotList[this.index].top;
       },
     },
@@ -375,7 +377,12 @@
         //调用子组件方法
         var obj = this.$refs.chooseMenu.getChooseMenu();
         if (this.index > -1 && this.hotspotList.length > 0) {
-          this.hotspotList[this.index].link = obj
+          if (this.chooseType == "rubik") {
+            this.hotspotList[this.index].link.push(obj)
+          } else {
+            this.hotspotList[this.index].link = obj
+          }
+
         }
         this.isShowLink = false;
       },

src/components/common/choiceGood.vue

@@ -42,6 +42,7 @@
           pageIndex: 1,
           pageSize: 15,
           Name: '',
+          GoodsStatus:1  //上架中
         },
         total: 0,
         selectRow: [],

src/components/orderMan/CostManagement.vue

+<template>
+  <div class="CostManagement">
+    <div class="head-title">
+      成本管理
+      <el-button style="float:right" size="small" @click="creatDanju" type="primary">生成单据
+      </el-button>
+    </div>
+    <div class="content">
+      <div style="margin-bottom:20px">
+        <span>供应商</span>
+        <el-select style="margin:0 10px" class="w100" @change="getList" v-model="msg.SupplierId" size="small"
+          placeholder="请选择">
+          <el-option label="不限" :value="0"></el-option>
+          <el-option v-for="item in SupplierData" :key="item.Id" :label="item.Name" :value="item.ID">
+          </el-option>
+        </el-select>
+        <span>是否制单</span>
+        <el-select class="w100" style="margin-right: 10px;" @change="getList" v-model="msg.IsFinance" size="small"
+          placeholder="请选择">
+          <el-option label="全部" :value="0"></el-option>
+          <el-option label="已制单" :value="1"></el-option>
+          <el-option label="未制单" :value="2"></el-option>
+        </el-select>
+        <span>日期</span>
+        <el-date-picker v-model="dateList" @change="getList" size="small" type="datetimerange" range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+      </div>
+      <el-table :data="tableData" v-loading="loading" border style="width: 100%"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" style="text-align:center;">
+        </el-table-column>
+        <el-table-column prop="OrderNo" label="订单号" width="220">
+        </el-table-column>
+        <el-table-column prop="GoodsName" label="商品名称">
+        </el-table-column>
+        <el-table-column prop="Original_Price" label="金额" width="80">
+        </el-table-column>
+        <el-table-column prop="CostMoney" label="成本" width="80">
+        </el-table-column>
+        <el-table-column prop="FreightCostMoney" label="快递成本" width="80">
+        </el-table-column>
+        <el-table-column prop="CostFinanceId" label="关联单号" width="100">
+        </el-table-column>
+      </el-table>
+      <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
+        layout="prev, pager, next" :total="total">
+      </el-pagination>
+    </div>
+    <!-- 选择是否公账 -->
+    <el-dialog title="请选择" :visible.sync="choiceFin" width="400px">
+      <el-radio v-model="finMsg.IsPublic" label="0">私账</el-radio>
+      <el-radio v-model="finMsg.IsPublic" label="1">公账</el-radio>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="choiceFin=false">取消</el-button>
+        <el-button type="primary" size="small" @click="setFince()">确定</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        loading: false,
+        //选择公账弹窗
+        choiceFin: false,
+        msg: {
+          pageIndex: 1,
+          pageSize: 15,
+          SupplierId: 0, //供应商
+          IsFinance: 0, //是否制单 0-全部 1-已制单 2-未制单
+          StartTime: '',
+          EndTime: ''
+        },
+        SupplierData: [], //供应商data
+        dateList: [], //日期
+        total: 0,
+        tableData: [], //列表数据
+        finMsg: {
+          SupplierId: 0,
+          IsFinance: 0,
+          IdList: [],
+          IsPublic: '0' //0-私账1-公账
+        },
+      }
+    },
+    created() {},
+    mounted() {
+      this.getAllSupplier();
+      this.getList();
+    },
+    methods: {
+      //获取供应商
+      getAllSupplier() {
+        this.apipost("/api/Supplier/GetSupplierAllList", {}, res => {
+          if (res.data.resultCode == 1) {
+            this.SupplierData = res.data.data;
+          }
+        })
+      },
+      getList() {
+        if (this.dateList && this.dateList.length > 0) {
+          this.msg.StartTime = this.dateList[0];
+          this.msg.EndTime = this.dateList[1];
+        } else {
+          this.msg.StartTime = '';
+          this.msg.EndTime = '';
+        }
+        this.loading = true;
+        this.apipost("/api/Supplier/GetSupplierGoodsList", this.msg, res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.total = res.data.data.count;
+            this.tableData = res.data.data.pageData;
+          }
+        })
+      },
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+      //点击生成单据
+      creatDanju() {
+        if (this.finMsg.IdList.length == 0) {
+          this.Info('请选择单据');
+        } else {
+          this.choiceFin = true;
+        }
+      },
+      handleSelectionChange(val) {
+        var selectRow = JSON.parse(JSON.stringify(val));
+        this.finMsg.IdList = [];
+        if (selectRow.length > 0) {
+          selectRow.forEach(x => {
+            this.finMsg.IdList.push(x.Id);
+          });
+        }
+      },
+      //设置单据
+      setFince() {
+        this.finMsg.SupplierId = this.msg.SupplierId;
+        this.finMsg.IsFinance = this.msg.IsFinance;
+        this.apipost("/api/Supplier/PayCostFinance", this.finMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success('设置成功');
+            this.choiceFin = false;
+          }
+        })
+      }
+
+    }
+  };
+
+</script>
+<style>
+  .CostManagement .content {
+    background: #fff;
+    margin-top: 10px;
+    padding: 20px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+
+</style>

src/components/orderMan/orderDetails.vue

@@ -70,7 +70,7 @@
                 <span
                   class="el-tag el-tag--success el-tag--small el-tag--light is-hit">{{dataInfo.OrderInfo.PaymentWayName}}</span>
               </div>
-              <div flex="dir:left cross:center" class="item-box">
+              <div v-if="dataInfo.OrderInfo.DeliveryMethodName && dataInfo.OrderInfo.DeliveryMethodName!=''" flex="dir:left cross:center" class="item-box">
                 <span class="label">配送方式:</span>
                 <span
                   class="el-tag el-tag--primary el-tag--small el-tag--light is-hit">{{dataInfo.OrderInfo.DeliveryMethodName}}</span>
@@ -145,7 +145,7 @@
                       <div v-for="(good,index2) in item.GoodsList" :key="index2" flex="dir:left"
                         style="margin-top: 10px;">
                         <span class="label">配送商品:</span>
-                        <img :src="domainManager().ImageUrl+good.CoverImagePath" class="goods-pic">
+                        <img :src="getIconLink(good.CoverImagePath)" class="goods-pic">
                       </div>
                     </div>
                   </el-col>
@@ -166,6 +166,12 @@
                   style="color: rgb(64, 158, 255); cursor: pointer; margin-left: 10px;"></i>
               </div>
             </div>
+            <div v-if="dataInfo.BuyerMessage && dataInfo.BuyerMessage!=''" flex="dir:left cross:center" class="item-box" style="flex-shrink: 0;">
+              <span class="label">买家留言:</span>
+              <div>
+                {{dataInfo.BuyerMessage}}
+              </div>
+            </div>
           </div>
         </el-col>
         <el-col :span="8">
@@ -198,7 +204,7 @@
           <el-table-column prop="Id" label="商品标题">
             <template slot-scope="scope">
               <div flex="dir:left cross:center">
-                <img :src="domainManager().ImageUrl+scope.row.CoverImagePath" alt=""
+                <img :src="getIconLink(scope.row.CoverImagePath)" alt=""
                   style="height: 60px; width: 60px; margin-right: 5px;">
                 <div class="app-ellipsis">
                   <div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 1;">
@@ -805,6 +811,11 @@
     width: 30px;
     background-image: url("../../assets/img/userman/status_2.png");
   }
+  .app-order-detail .step01 {
+    height: 30px;
+    width: 30px;
+    background-image: url("../../assets/img/userman/status_2.png");
+  }
 
   .app-order-detail .step05Active {
     height: 30px;

src/components/orderMan/orderList.vue

@@ -6,7 +6,7 @@
           class="upload-demo"
           ref="upload"
           :action="importFileUrl"
-          :multiple="true" 
+          :multiple="true"
           :on-success="successUpload"
           :show-file-list="false"
           accept=".csv">
@@ -17,7 +17,7 @@
       </el-button>
       <el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">
         清空回收站</el-button>
-      
+
     </div>
     <div class="content">
       <div>
@@ -78,8 +78,14 @@
                   <img v-if="item.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
                   <span>{{item.UserName}}</span>
                 </div>
+                <div v-if="item.BuyerMessage && item.BuyerMessage!=''" flex="cross:center" class="remark-box">
+                  <el-tooltip class="item" effect="dark" :content="item.BuyerMessage" placement="top">
+                    <img src="../../assets/img/userman/remark.png" alt="">
+                  </el-tooltip>
+
+                </div>
                 <div flex="dir:left wrap:wrap" class="app-order-offline">
-                  <div class="express-send-box">
+                  <div v-if="item.DeliveryMethodName && item.DeliveryMethodName!=''" class="express-send-box">
                     <span class="el-tag el-tag--small el-tag--light">{{item.DeliveryMethodName}}</span>
                   </div>
                   <el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
@@ -127,8 +133,8 @@
                       <div style="margin-bottom: 24px;">
                         <span style="margin-right: 10px;">
                           规格：
-                          <el-tag 
-                            :key="index2" 
+                          <el-tag
+                            :key="index2"
                             v-for="(msg,index2) in list.SpecificationList"
                             style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
                             size="mini">
@@ -190,6 +196,16 @@
                       <img @click="qrEnd(item,6)" v-if="item.OrderStatus==4" class="app-order-icon"
                         src="../../assets/img/userman/sale.png" alt="">
                     </el-tooltip>
+                    <!--待处理-->
+                    <el-tooltip class="item" effect="dark" content="同意" placement="top">
+                      <img @click="pending(item,1)" v-if="item.OrderStatus==6" class="app-order-icon"
+                           src="../../assets/img/userman/pass.png" alt="">
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="拒绝" placement="top">
+                      <img @click="pending(item,2)" v-if="item.OrderStatus==6" class="app-order-icon"
+                           src="../../assets/img/userman/nopass.png" alt="">
+                    </el-tooltip>
+
                   </template>
 
                   <!-- 回收站 -->
@@ -228,7 +244,7 @@
             <div class="card-footer">
               <div>
                 <div flex="dir:left">
-                  <div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}} 
+                  <div class="address-box">收货人: {{item.Consignee}} 电话：{{item.Mobile}}
                     地址：{{item.DistrictAddress}}
                     {{item.ShoppingAddress}}</div>
                   <button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button"
@@ -272,6 +288,14 @@
         <el-button size="small" type="primary" @click="submitForm('exitMsg')">确 定</el-button>
       </span>
     </el-dialog>
+    <!--待处理-->
+    <el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%">
+      <el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="pendD = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="pendingForm()">确 定</el-button>
+      </span>
+    </el-dialog>
     <!-- 发货 -->
     <el-dialog custom-class="app-send" title="发货" :visible.sync="fhDig" width="35%">
       <div class="title-box">
@@ -283,7 +307,7 @@
         </el-table-column>
         <el-table-column prop="id" label="图片" width="60">
           <template slot-scope="scope">
-            <img style="width:30px;height:30px" :src="domainManager().ImageUrl+scope.row.CoverImagePath" alt="">
+            <img style="width:30px;height:30px" :src="getIconLink(scope.row.CoverImagePath)" alt="">
           </template>
         </el-table-column>
         <el-table-column prop="GoodsName" label="名称" width="314">
@@ -298,7 +322,7 @@
         </el-table-column>
       </el-table>
       <div class="title-box"><span class="text">物流信息</span></div>
-      <el-form :model="fhMsg" ref="exitMsg" :rules="fhrules" label-width="130px">
+      <el-form :model="fhMsg" ref="fhMsg" :rules="fhrules" label-width="130px">
         <el-form-item label="物流快递">
           <el-radio v-model="fhMsg.Type" :label="1">快递</el-radio>
           <el-radio v-model="fhMsg.Type" :label="2">其他方式</el-radio>
@@ -500,8 +524,15 @@
           Remark: '',
           OrderDetailIdList: [],
         },
+        // 待处理
+        pendMgs:{
+          OrderId:0,
+          Type:1,
+          Remark:0,
+        },
         fahuoList: [],
         fhDig: false,
+        pendD:false,
         exitMsg: {
           OrderId: 0,
           Type: 1,
@@ -761,6 +792,28 @@
           null
         );
       },
+      pending(item,type){
+        this.pendD=true;
+        this.pendMgs.OrderId = item.OrderId;
+        this.pendMgs.Type = type;
+        this.pendMgs.Remark = '';
+      },
+      // 待处理调用接口
+      pendingForm(){
+        this.apipost('/api/order/SetOrderApplyForCancelAudit', this.pendMgs,
+          res => {
+            if (res.data.resultCode === 1) {
+              this.pendD= false
+              this.getList();
+              this.Success(res.data.message)
+
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+
+        );
+      },
       // 确认完成
       qrEnd(item, num) {
         let msg = {
@@ -1190,6 +1243,10 @@
 </script>
 
 <style>
+.orderList .remark-box {
+    padding-top: 3px;
+    margin-left: 7px;
+}
   .orderList .upload-demo{
     float:right;
     margin-top: -5px;

src/components/orderMan/salesOrderDetails.vue

@@ -98,7 +98,7 @@
           <el-table-column prop="Id" label="商品标题">
             <template slot-scope="scope">
               <div flex="dir:left cross:center">
-                <img :src="domainManager().ImageUrl+scope.row.CoverImagePath" alt=""
+                <img :src="getIconLink(scope.row.CoverImagePath)" alt=""
                   style="height: 60px; width: 60px; margin-right: 5px;">
                 <div class="app-ellipsis">
                   <div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 1;">
@@ -541,24 +541,27 @@
         this.apipost("/api/order/GetOrderAfterSaleInfo", {
           ReOrderId: this.ReOrderId
         }, res => {
-          this.dataInfo = res.data.data;
-          let data = res.data.data;
-          // 未付款
-          if (data.CreateDate != '' && data.AuditTime=='') {
-            this.activeStep = 1;
-          }
-          if (data.CreateDate != '' && data.AuditTime!='' && data.FinishTime=='') {
-            this.activeStep = 2;
-          }
-          if (data.FinishTime!='') {
-            this.activeStep = 3;
+          if(res.data.resultCode==1){
+            this.dataInfo = res.data.data;
+            let data = res.data.data;
+            // 未付款
+            if (data.CreateDate != '' && data.AuditTime=='') {
+              this.activeStep = 1;
+            }
+            if (data.CreateDate != '' && data.AuditTime!='' && data.FinishTime=='') {
+              this.activeStep = 2;
+            }
+            if (data.FinishTime!='') {
+              this.activeStep = 3;
+            }
+            
+            if (data.OrderInfo) {
+              this.OrderInfo = data.OrderInfo;
+            }
+            this.DetailList=[];
+            this.DetailList.push(data.OrderInfo)
           }
           
-          if (data.OrderInfo) {
-            this.OrderInfo = data.OrderInfo;
-          }
-          this.DetailList=[];
-          this.DetailList.push(data.OrderInfo)
         })
       },
       // 快递公司

src/components/sallCenter/CustomPage.vue

@@ -8,6 +8,14 @@
         </el-button>
       </div>
       <div class="content">
+        <div class="searchInput">
+          <el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入标题名称" v-model="msg.PageName"
+            size="small" clearable @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()">
+          </el-input>
+          <span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"
+            @click="msg.pageIndex=1,getList()"> </span>
+        </div>
+        <br>
         <el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0">
           <el-table-column prop="Id" label="ID" width="100">
           </el-table-column>
@@ -122,13 +130,14 @@
   export default {
     data() {
       return {
-        commonIndex:-1,
+        commonIndex: -1,
         loading: false,
         CustomIsShowAdd: true,
         //模板弹窗
-        isShowModule:false,
+        isShowModule: false,
         dataList: [],
         msg: {
+          PageName: "", //页面名称
           pageIndex: 1,
           pageSize: 10,
         },
@@ -151,10 +160,10 @@
     },
     methods: {
       //选择模板
-      getCustom(obj){
-        if (this.commonIndex > -1) {  
+      getCustom(obj) {
+        if (this.commonIndex > -1) {
           this.addMsg.DetailsList[this.commonIndex].TemplateId = obj.Id;
-          this.addMsg.DetailsList[this.commonIndex].TemplateShowName='#'+obj.Id+':'+obj.TemplateName;
+          this.addMsg.DetailsList[this.commonIndex].TemplateShowName = '#' + obj.Id + ':' + obj.TemplateName;
         }
         this.isShowModule = false;
       },

src/components/sallCenter/IntegralRecord.vue

@@ -138,6 +138,9 @@
       created(){
         this.getDateList()
         this.getDown();
+        if(this.$route.query.UserId){
+          this.msg.UserId=this.$route.query.UserId
+        }
 
       },
       methods:{

src/components/sallCenter/balanceBudget.vue

@@ -24,7 +24,7 @@
           <div class="searchInput" style="width:250px">
             <el-input style="display:inline-block;width:225px;height:30px"
                       placeholder="请输入昵称搜索"
-                      v-model="msg.Name"
+                      v-model="msg.MemberName"
                       size="small"
                       clearable>
             </el-input>
@@ -116,7 +116,7 @@
             msg:{
               pageIndex:1,
               pageSize:20,
-              Name:'',
+              MemberName:'',
               StartDate:'',
               EndDate:'',
             },
@@ -169,7 +169,7 @@
         },
         Export(){
           let msg = {
-            Name:this.msg.Name,
+            MemberName:this.msg.MemberName,
             StartDate :this.msg.StartDate ,
             EndDate :this.msg.EndDate,
             ExcelEnumIds:this.checkedCities

src/components/sallCenter/couponManage.vue

@@ -50,7 +50,12 @@
           label="优惠方式"
           width="150">
           <template slot-scope="scope">
-            <div >优惠:{{scope.row.DiscountsPrice}}元</div>
+            <div v-if="scope.row.CouponType==1">优惠:{{scope.row.DiscountsPrice}}元</div>
+            <div v-if="scope.row.CouponType==2">
+              <div>{{scope.row.DiscountsPrice}}折</div>
+              <div v-if="scope.row.MaxDiscountsPrice!=0">优惠上限:{{scope.row.MaxDiscountsPrice}}元</div>
+              <div v-if="scope.row.MaxDiscountsPrice==0">优惠上限:无上限</div>
+            </div>
           </template>
         </el-table-column>
         <el-table-column
@@ -73,8 +78,8 @@
           label="数量"
           width="150">
           <template slot-scope="scope">
-            <div>总数量：{{scope.row.TotalNum ==-1? '无限制领取':scope.row.TotalNum}}</div>
-            <div v-if="scope.row.TotalNum !=-1">剩余发放数：{{scope.row.ResidueNum}}</div>
+            <div>总数量：{{scope.row.TotalNum ==-1? '无限制领取':scope.row.TotalNum+scope.row.ResidueNum}}</div>
+            <div v-if="scope.row.TotalNum !=-1">剩余发放数：{{scope.row.TotalNum}}</div>
           </template>
         </el-table-column>
 

src/components/sallCenter/plugin/check-in.vue

@@ -39,7 +39,7 @@
         </el-form-item>
         <el-form-item label="点击热区">
           <choiceArea :multiple="false" :pic-url="data.backgroundPicUrl" :hotspot-array="data.hotspot?[data.hotspot]:[]"
-                width="750px" height="200px" @confirm="selectHotspot" :is-link="false">
+                width="750px" height="200px" @confirm="selectHotspot" :is-link="false" :chooseType="'checkin'">
             <el-button size="mini">设置热区</el-button>
           </choiceArea>
         </el-form-item>

src/components/sallCenter/plugin/rubik.vue

@@ -161,7 +161,7 @@
               </template>
               <el-form-item label="热区划分">
                 <choiceArea :multiple="true" :pic-list="rubData.data.list" :hotspot-array="rubData.data.hotspot"
-                  width="750px" :height="rubData.data.height + 'px'" @confirm="selectHotspot" :is-link="true">
+                  width="750px" :height="rubData.data.height + 'px'" @confirm="selectHotspot" :is-link="true" :chooseType="'rubik'">
                   <el-button size="mini">划分热区</el-button>
                 </choiceArea>
               </el-form-item>
@@ -723,6 +723,7 @@
 
       // 热区选择(edit)
       selectHotspot(list) {
+          //console.log("list",list);
         this.rubData.data.hotspot = list;
       },
       //选择图片

src/components/sallCenter/templateManage.vue

@@ -35,6 +35,14 @@
       </div>
     </div>
     <div class="temp_content">
+      <div class="searchInput" style="margin-bottom:20px;">
+        <el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入模板名称" v-model="qMsg.TemplateName"
+          size="small" clearable @keyup.enter.native="qMsg.pageIndex=1,getList()" @clear="qMsg.pageIndex=1,getList()">
+        </el-input>
+        <span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"
+          @click="qMsg.pageIndex=1,getList()"> </span>
+      </div>
+      <br>
       <el-table :data="dataList" border style="width: 100%">
         <el-table-column prop="Id" label="编号"></el-table-column>
         <el-table-column prop="TemplateName" label="模板名称"></el-table-column>
@@ -50,8 +58,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="qMsg.pageSize"
-        layout="prev, pager, next" :total="total">
+      <el-pagination style="text-align:right" background @current-change="handleCurrentChange"
+        :page-size="qMsg.pageSize" layout="prev, pager, next" :total="total">
       </el-pagination>
     </div>
   </div>
@@ -62,6 +70,7 @@
       return {
         dataList: [],
         qMsg: {
+          TemplateName: "", //模板名称
           pageIndex: 1,
           pageSize: 15,
         },

src/components/sallCenter/templateMarket.vue

@@ -7,6 +7,14 @@
       </div>
     </div>
     <div class="content">
+      <div class="searchInput" style="margin:10px 0 20px 20px;">
+        <el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入模板名称" v-model="qMsg.Name"
+          size="small" clearable @keyup.enter.native="qMsg.pageIndex=1,getList()" @clear="qMsg.pageIndex=1,getList()">
+        </el-input>
+        <span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"
+          @click="qMsg.pageIndex=1,getList()"> </span>
+      </div>
+      <br>
       <div class="template_MarketList">
         <div class="Market_List" v-for="(item,index) in dataList" :key="index">
           <div class="MarketInner">
@@ -36,6 +44,9 @@
           </div>
         </div>
       </div>
+      <el-pagination style="text-align:right" background @current-change="handleCurrentChange"
+        :page-size="qMsg.pageSize" layout="prev, pager, next" :total="total">
+      </el-pagination>
     </div>
     <el-dialog title="手机端预览" :visible.sync="viewDialog" width="600px">
       <div class="MarketView" ref="MarketView">
@@ -58,9 +69,10 @@
         dataList: [],
         qMsg: {
           pageIndex: 1,
-          pageSize: 15,
+          pageSize: 16,
           IsUse: 1,
           IsShow: 1,
+          Name: "", //模板名称
         },
         total: 0,
       };
@@ -127,6 +139,15 @@
     box-sizing: border-box;
   }
 
+  .templateMarket .template_comheader {
+    padding: 13px 20px;
+    border-bottom: 1px solid #EBEEF5;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    background: #fff;
+    margin-bottom: 10px;
+  }
+
   .templateMarket .template_comheader>div {
     display: flex;
     justify-content: space-between;

src/components/sallCenter/templateMarketManage.vue

@@ -31,8 +31,10 @@
     <div class="template_comheader">
       <div>
         <span>模板市场管理</span>
-        <el-button type="primary" size="small" @click="CommonJump('templateMarket',{})">模板市场</el-button>
-        <el-button type="primary" size="small" @click="isShow=true,clearMsg()">新增</el-button>
+        <div style="float:right;">
+          <el-button type="primary" size="small" @click="CommonJump('templateMarket',{})">模板市场</el-button>
+          <el-button type="primary" size="small" @click="isShow=true,clearMsg()">新增</el-button>
+        </div>
       </div>
     </div>
     <div class="temp_content">

src/plug/index.js

@@ -55,7 +55,7 @@ export default {
             Vue.prototype.domainManager = function() {
                 let domainUrl = '';
                 domainUrl = "https://mallapi.oytour.com";
-                //domainUrl = "https://localhost:5001";
+                domainUrl = "https://localhost:5001";
                 let locationName = window.location.hostname;
                 if (locationName.indexOf('testmall.oytour') !== -1) {
                     domainUrl = "https://mallapi.oytour.com";
@@ -265,6 +265,9 @@ export default {
                     MallBaseId: MallBaseId,
                     TenantId: TenantId,
                     EmpId: EmpId,
+                    // MiniAppId:"wxacd9f8cc3480d29e",
+                    // OpenId:"ow_7I5ZQKhAB66yvOTGI35Xk-Kmg",
+                    // UserId:19992,
                 }
                 return postData
             },

src/router/index.js

@@ -283,6 +283,17 @@ export default new Router({
           path: '/taoBaoCSV',
           name: 'taoBaoCSV',
           component: resolve => require(['@/components/CommodityMan/taoBaoCSV'], resolve),
+        }, // 商品管理 供应商管理
+        {
+          path: '/supplierManage',
+          name: 'supplierManage',
+          component: resolve => require(['@/components/CommodityMan/supplierManage'], resolve),
+        },
+        // 商品管理 供应商新增或修改
+        {
+          path: '/supplierEdit',
+          name: 'supplierEdit',
+          component: resolve => require(['@/components/CommodityMan/supplierEdit'], resolve),
         },
         // 订单管理 商品列表新增
         {
@@ -302,6 +313,12 @@ export default new Router({
           name: 'afterSalesOrder',
           component: resolve => require(['@/components/orderMan/afterSalesOrder'], resolve),
         },
+        //成本管理
+        {
+          path: '/CostManagement',
+          name: 'CostManagement',
+          component:resolve => require(['@/components/orderMan/CostManagement'], resolve),
+        },
         // 订单管理 售后订单详情
         {
           path: '/salesOrderDetails',
@@ -332,6 +349,18 @@ export default new Router({
           name: 'BulkShipment',
           component: resolve => require(['@/components/orderMan/BulkShipment'], resolve),
         },
+        // 订单管理 批量发货
+        {
+          path: '/BulkShipment',
+          name: 'BulkShipment',
+          component: resolve => require(['@/components/orderMan/BulkShipment'], resolve),
+        },
+        // 订单管理 财务配置
+        {
+          path: '/financialAllocation',
+          name: 'financialAllocation',
+          component: resolve => require(['@/components/orderMan/financialAllocation'], resolve),
+        },
 
         //设置 基础设置
         {