Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

buyer/src/components/Search.vue

@@ -147,12 +147,14 @@ export default {
   cursor: pointer;
 }
 .store-search{
-  width:63px;
+  width:55.6px;
   padding: 0 9px;
   border-radius: 0;
+  border-radius: 3px;
   &:nth-child(2){
-    width:62px;
+    width:55px;
-    margin-left: -5px;
+    margin-left: -2px;
+    border-radius: 3px;
   }
 }
 .btn-div{

buyer/src/components/goodsDetail/ShowGoodsDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height:auto;">
     <div class="item-intro-show">
       <div class="item-intro-detail" ref="itemIntroDetail">
         <div class="item-intro-nav item-tabs">
@@ -71,7 +71,7 @@
             </TabPane>
             <TabPane label="商品参数">
               <template v-if="detail.goodsParamsDTOList && detail.goodsParamsDTOList.length">
-                <div class="goods-params" v-for="item in detail.goodsParamsDTOList" :key="item.groupId">
+                <div class="goods-params" style="height:inherit;" v-for="item in detail.goodsParamsDTOList" :key="item.groupId">
                   <span class="ml_10">{{item.groupName}}</span>
                   <table class="mb_10" cellpadding='0' cellspacing="0" >
                     <tr v-for="param in item.goodsParamsItemDTOList" :key="param.paramId">
@@ -220,6 +220,7 @@ export default {
   width: 1200px;
   margin: 15px auto;
   display: flex;
+  overflow: scroll;
   flex-direction: row;
 
 }

buyer/src/components/indexDecorate/modelList/Recommend.vue

@@ -161,7 +161,7 @@ export default {
           padding: 0 10px;
           font-size: 12px;
           >div:nth-child(1) {
-            width: 130px;
+
             margin-top: 30px;
             span:nth-child(1){
                 color: #fff;
@@ -169,7 +169,7 @@ export default {
                 padding: 0 5px;
                 background-color: #a25684;
                 display: block;
-                width: 120px;
+
                 overflow: hidden;
                 white-space: nowrap;
                 margin: 0 10px 10px 0;

manager/src/views/lili-floor-renovation/floorList.vue

@@ -82,7 +82,9 @@ export default {
         pageNumber:1,
         pageSize:10,
         sort: 'createTime',
-        order: 'desc'
+        order: 'desc',
+        pageType:"INDEX",
+        pageClientType:"PC",
       },
       columns: [
         // 列表展示的column

manager/src/views/member/list/index.vue

@@ -51,6 +51,9 @@
     <!-- 修改模态框 -->
     <Modal v-model="descFlag" :title="descTitle" @on-ok="handleSubmitModal" width="500">
       <Form ref="form" :model="form" :rules="ruleValidate" :label-width="80">
+
+        <Input v-model="form.id" v-show="false"/>
+
         <FormItem label="头像">
           <img :src="form.face" class="face" />
           <Button type="text" class="upload" @click="() => {
@@ -462,7 +465,7 @@ export default {
 
     // 提交修改数据
     handleSubmitModal() {
-      const { nickName, sex, username, face, newPassword } = this.form;
+      const { nickName, sex, username, face, newPassword,id } = this.form;
       let time = new Date(this.form.birthday);
       let birthday =
         time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
@@ -474,6 +477,7 @@ export default {
         sex,
         birthday,
         face,
+        id
       };
       if (this.region != "undefined") {
         submit.regionId = this.regionId;

manager/src/views/my-components/lili/upload-pic-thumb.vue

@@ -62,7 +62,7 @@ export default {
   },
   props: {
     value: {
-      type: Object
+      type: null
     },
     draggable: {
       type: Boolean,