1

src/components/orderMan/afterSalesOrder.vue

@@ -603,7 +603,7 @@ export default {
             });
         },
         TableSelectChange(val){},
-        // 发货f
+        // 发货
         fhOpenDig(item){
             this.fhMsg.AfterSaleOrderId=item.ReOrderId;
             this.fahuoList=[];

src/components/orderMan/orderDetails.vue

@@ -791,7 +791,6 @@
                   this.getData();
                   this.Success(res.data.message)
                   this.shDig = false;
-
                 } else {
                   this.Error(res.data.message);
                 }

src/components/phoneManage/adminList.vue

@@ -59,9 +59,9 @@
       </div>
     </template>
     <el-dialog title="设置管理员" :visible.sync="isShowModule" width="600px">
-      <el-form :model="addMsg" :rules="addMsgRules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="usermsg" :rules="addMsgRules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
         <el-form-item label="昵称搜索" prop="Name">
-          <el-select v-model="addMsg.UserId" placeholder="请选择" filterable>
+          <el-select v-model="usermsg.Name" placeholder="请选择" filterable  :filter-method="ChangeListName">
             <el-option v-for="item in adminOptions" :key="item.Id" :label="item.Name" :value="item.Id">
             </el-option>
           </el-select>
@@ -114,6 +114,15 @@
             trigger: "blur"
           }],
         },
+        usermsg: {
+          pageIndex: 1,
+          pageSize: 20,
+          Name: '',
+          Source: 0,
+          MemberGrade: 0,
+          Id: 0,
+          Moblie: ''
+        },
       };
     },
     methods: {
@@ -177,12 +186,15 @@
             }
           );
         });
+      },
+       ChangeListName(val) {
+        this.usermsg.Name = val;
+        this.getUserList();
       },
       //获取用户列表
       getUserList() {
-        var qMsg={PageIndex:1,PageSize:1000000};
         this.apipost(
-          "/api/user/GetMemberUserDropDownList", qMsg,
+          "/api/user/GetMemberUserDropDownList", this.usermsg,
           (res) => {
             if (res.data.resultCode == 1) {
               this.adminOptions = res.data.data.pageData;

src/components/setup/basicSetUp.vue

@@ -880,30 +880,30 @@
           MallName: '', //商城名称
           Indate: '', //有效期
           ContactNumber: '', //联系号码
-          OuterServiceLink: '',
-          Address: '',
-          LongAndLat: '',
-          MinAppId: '',
-          MinUrl: '',
-          CancelTime: 0,
-          AutoReceiving: 0,
-          AfterTime: 0,
-          PayWay: '',
-          DeliverWay: '',
-          BalanceFun: 0,
+          OuterServiceLink: '',//外链客服链接
+          Address: '',//详细地址
+          LongAndLat: '',//经纬度
+          MinAppId: '',//小程序appId
+          MinUrl: '',//小程序路径
+          CancelTime: 0,//未支付订单超时时间
+          AutoReceiving: 0,//自动确认收货时间
+          AfterTime: 0,//售后时间
+          PayWay: '',//支付方式
+          DeliverWay: '',//发货方式
+          BalanceFun: 0,//余额功能
           DepositFun:0,//储值卡
-          ConsultWay: '',
-          MinSwitch: 1,
-          MinBackColor: '#000000',
-          MinBackClarity: 100,
-          MinBackCircularBead: 36,
-          MinTips: '添加到我的小程序，购买更便捷',
-          MinTipsColor: '#FFFFFF',
-          MinIcoColor: 1,
-          MinShareTitle: '',
-          MinShareIco: '',
-          BuySwitch: 0,
-          CarouselOrder: 0,
+          ConsultWay: '',//商品面议联系方式
+          MinSwitch: 1,//添加到我的小程序开关
+          MinBackColor: '#000000',//背影颜色
+          MinBackClarity: 100,//背影透明度
+          MinBackCircularBead: 36,//背景框圆角
+          MinTips: '添加到我的小程序，购买更便捷',//提示文本内容
+          MinTipsColor: '#FFFFFF',//文本颜色
+          MinIcoColor: 1,//图标颜色
+          MinShareTitle: '',//转发标题
+          MinShareIco: '',//选择图标
+          BuySwitch: 0,//首页购买记录框开关
+          CarouselOrder: 0,//轮播订单数
           ListShopCar: 0,
           ListBuyCount: 1,
           ListName: 1,