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

src/components/SalesModule/groupTourOrder.vue

@@ -1260,7 +1260,7 @@
     <!--    申请优惠-->
     <div class="productQuerybottomLayer ownScrollbarStyle" v-show="SpecialOffer"
       style="height: 150px;min-height:200px;">
-      <p>{{$t('salesModule.ApplyYH')}}
+      <p>{{$t('pub.ApplyYH')}}
         <span class="fr">
           <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmitRemarks()" />
           <input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="Preservation()" />
@@ -1270,7 +1270,7 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item>
-              <em style="font-size: 12px !important;color: #606266;line-height: 34px">{{$t('salesModule.NowPrice')}}</em>
+              <em style="font-size: 12px !important;color: #606266;line-height: 34px">{{$t('pub.NowPrice')}}</em>
               <em
                 style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;"
                 class='w150'>{{SOMsg.OrderUnitPrice}}</em>

src/components/index.vue

@@ -191,7 +191,7 @@
                       合同管理
                        <i class="iconfont icon-right1"></i>
                     </el-dropdown-item>
-                    <el-dropdown-item class="clearfix _dropdown_other"  @click.native="goUrlZC()">
+                    <el-dropdown-item class="clearfix _dropdown_other"  @click.native="goUrlZC()" v-if="qjGroupId==userInfo.RB_Group_id">
                       <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
                       资产管理
                        <i class="iconfont icon-right1"></i>
@@ -847,7 +847,7 @@
 				<div style="width: 100%; height: 50px;"></div>
 			</div>
 			</div>
-      <div class="logsBack" v-if="logsShow">
+      <div class="logsBack" v-if="logsShow&&isShowMore">
         <div class="updateLogs">
             <img src="../assets/img/logsImg.png" alt="" class="logsImg" />
             <div class="logsTitle">
@@ -1103,7 +1103,7 @@
     </el-dialog>
 
 
-    <div v-show="mazip==0" id="downzip">
+    <div v-show="mazip==0&&isShowMore" id="downzip">
       <div>
         <div>
           <a href="http://im.oytour.com/麦子助手.exe">
@@ -1117,7 +1117,7 @@
      <a id='groupTourOrderByTuan_DownLoad' target="_blank" style="display:none"></a>
 
      <!-- 投诉 -->
-     <div class="tsDiv" v-if="tsState">
+     <div class="tsDiv" v-if="tsState&&isShowMore">
       <div class="tsContent">
       <div style="width:100%;height:372px;position:relative">
           <p style="text-align:center;font-size:14px;z-index:100;">投诉案例</p>
@@ -1839,7 +1839,9 @@ export default {
               }
             }
             if (!rep) {
-              this.saleRnkShow = true
+              if(this.isShowMore){
+                this.saleRnkShow = true
+              }
               arr.push(this.NewSaleRnkInfo.StartDateMonth + this.NewSaleRnkInfo.StartDateDay)
             }
             localStorage.saleRnkInfo = JSON.stringify(arr)

src/components/personalCenter/sell.vue

@@ -2,7 +2,12 @@
   <div class="sell-box">
     <div class="top">
       <div class="h">
-        <img :src="champion.employeeImg" :onerror="defaultHeadImg" />
+         <template v-if="CurrentUserInfo.RB_Group_id==2">
+            <img :src="champion.employeeImg" :onerror="defaultHeadImg" />
+         </template>
+         <template>
+            <img src="../../assets/img/default_head_img.jpg" :onerror="defaultHeadImg" />
+         </template>
       </div>
       <img class="caidai" src="../../assets/img/persion/caidai.png" />
       <div class="money" v-if="CurrentUserInfo.RB_Group_id==2">