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

src/components/director/directorGoodsEdit.vue

@@ -221,7 +221,7 @@
                     </div>
                   </el-form-item>
                   <el-form-item label="乘坐人数" prop="RideNum">
-                    <el-input v-model="addMsg.RideNum" size="small" placeholder="请输入内容" class="input-with-select">
+                    <el-input v-model="addMsg.RideNum" size="small" @keyup.native="checkInteger(addMsg,'RideNum')" placeholder="请输入内容" class="input-with-select">
                       <el-button slot="append">人</el-button>
                     </el-input>
                   </el-form-item>
@@ -230,7 +230,7 @@
                     <el-radio v-model="addMsg.IsSpell" :label="2">否</el-radio>
                   </el-form-item>
                   <el-form-item label="提前预定天数" prop="AdvanceDay">
-                    <el-input v-model="addMsg.AdvanceDay" size="small" placeholder="请输入内容" class="input-with-select">
+                    <el-input v-model="addMsg.AdvanceDay" size="small" @keyup.native="checkPrice(addMsg,'AdvanceDay')" placeholder="请输入内容" class="input-with-select">
                       <el-button slot="append">天</el-button>
                     </el-input>
                   </el-form-item>

src/components/orderMan/carEvaluation.vue

@@ -25,6 +25,18 @@
         <el-form-item label="订单id">
           <el-input v-model="addMsg[0].OrderDetailId" size="small"></el-input>
         </el-form-item>
+        <el-form-item label="用户头像">
+            <el-tooltip class="item" effect="dark" content="建议尺寸100*100" placement="top">
+                <el-button @click="openChangeDig(3)" size="small">选择文件</el-button>
+            </el-tooltip>
+            <div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;">
+                <img v-if="!userPath || userPath==''"
+                src="../../assets/img/default.png" style="width:80px;height:80px" alt="">
+                <img v-else style="width:80px;height:80px" :src="userPath"
+                alt="">
+            </div>
+        </el-form-item>
+
         <el-form-item>
           <label slot="label">
             <span style="color:red">*</span>商品
@@ -157,7 +169,8 @@
           CommentImgList: [], //评论图片
           CommentScore: 5, //分数
           GuideId: 0, // 导游id（新增一条评论需新增2调数据，一个是对导游（车辆id=0）的一个是对车辆的（导游id=0），）	
-          CarId: ''
+          CarId: '',
+          UserPhoto:0, //用户头像
         }, {
           PlatformSource: 1, //用户来源
           CreateDate: '', //评论日期
@@ -168,7 +181,8 @@
           CommentImgList: [], //评论图片
           CommentScore: 5, //分数
           GuideId: '', // 导游id（新增一条评论需新增2调数据，一个是对导游（车辆id=0）的一个是对车辆的（导游id=0），）	
-          CarId: 0
+          CarId: 0,
+          UserPhoto:0, //用户头像
         }],
         msg: {
           pageIndex: 1,
@@ -187,7 +201,7 @@
 
         GuideList: [], //导游列表
         CarList: [], //导游列表
-
+        userPath:'', //用户头像
       };
     },
     created() {
@@ -208,6 +222,12 @@
           let url = this.getIconLink(msg.url)
           this.addMsg[1].CommentImgList.push(url);
         }
+        if (this.imgType == 3) {
+          let url = this.getIconLink(msg.url);
+          this.userPath = url;
+          this.addMsg[0].UserPhoto=msg.selectId;
+          this.addMsg[1].UserPhoto=msg.selectId;
+        }
         this.changeState = false;
       },
       //删除图片