瀏覽代碼

Merge remote-tracking branch 'origin/dev4.6.3.14' into dev4.6.3.14

wangkaiyue 3 年之前
父節點
當前提交
2f2ae2a3f1

+ 8 - 1
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_buyer-example.js

@@ -5,7 +5,7 @@ var vipDialog = `
       <img class="vip_img" :src="imgurl" />
       <span class="vip_example">示例</span>
     </div>
-  </div>  
+  </div>
   <div class="vip_head">
       <span style="display:none;">{{getTextMap.titleText}}</span>
       <span class="vip_extend"><span>{{getTextMap.headText.top}}</span><br/>{{getTextMap.headText.bot}}</span>
@@ -137,6 +137,13 @@ var buyerExample = {
           textMap.headText.bot = '与企业关系远近,辅助投标决策!'
           textMap.source = 'buyer_portrait_topShow_freeuser'
           break
+        }
+        // 首次合作企业
+        case 'item_88': {
+          textMap.headText.top = '通过挖掘首次合作企业,直观了解采购单位'
+          textMap.headText.bot = '现阶段密切合作企业,辅助投标决策!'
+          textMap.source = 'buyer_portrait_firstShow_freeuser'
+          break
         }
           // 合作企业注册资本分布
         case 'item_9': {

+ 4 - 4
src/jfw/modules/app/src/web/templates/big-member/page_free_buyer_project_news.html

@@ -326,10 +326,10 @@
                             ${scope.row.bidamount ?(scope.row.bidamount/10000).toFixed(2):""}
                           </template>
                         </el-table-column>
-                        <el-table-column
-                                prop="area"
-                                label="省份">
-                        </el-table-column>
+<!--                        <el-table-column-->
+<!--                                prop="area"-->
+<!--                                label="省份">-->
+<!--                        </el-table-column>-->
                         <el-table-column
                                 prop="firsttime"
                                 label="发布时间"

+ 4 - 4
src/jfw/modules/app/src/web/templates/big-member/page_free_ent_project_news.html

@@ -196,10 +196,10 @@
                     ${scope.row.bidamount ?(scope.row.bidamount/10000).toFixed(2):""}
                   </template>
                 </el-table-column>
-                <el-table-column
-                  prop="area"
-                  label="省份">
-                </el-table-column>
+<!--                <el-table-column-->
+<!--                  prop="area"-->
+<!--                  label="省份">-->
+<!--                </el-table-column>-->
                 <el-table-column
                   prop="firsttime"
                   label="发布时间"

+ 4 - 4
src/web/templates/big-member/wx/page_free_buyer_project_news.html

@@ -321,10 +321,10 @@
                 ${scope.row.bidamount ?(scope.row.bidamount/10000).toFixed(2):""}
               </template>
             </el-table-column>
-            <el-table-column
-              prop="area"
-              label="省份">
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              prop="area"-->
+<!--              label="省份">-->
+<!--            </el-table-column>-->
             <el-table-column
               prop="firsttime"
               label="发布时间"

+ 4 - 4
src/web/templates/big-member/wx/page_free_ent_project_news.html

@@ -191,10 +191,10 @@
                 ${scope.row.bidamount ?(scope.row.bidamount/10000).toFixed(2):""}
               </template>
             </el-table-column>
-            <el-table-column
-              prop="area"
-              label="省份">
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              prop="area"-->
+<!--              label="省份">-->
+<!--            </el-table-column>-->
             <el-table-column
               prop="firsttime"
               label="发布时间"

+ 6 - 1
src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -761,10 +761,15 @@
                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_12" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/12.png'></buyer-example>
             </div>
             <!-- 重点合作企业 -->
-            <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/08-bg.png') no-repeat;background-size:100% 100%">
+            <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/08-bg.png') no-repeat;background-size:100% 100%;background-position: top 30px center;background-color: white;margin-top: 2px;">
               <p class="example-title">重点合作企业</p>
                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_8" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/08.png'></buyer-example>
             </div>
+            <!-- 首次合作企业 -->
+            <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/08-bg.png') no-repeat;background-size:100% 100%;background-position: top 30px center;background-color: white;margin-top: 2px;">
+              <p class="example-title">首次合作企业</p>
+              <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_88" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/088.png'></buyer-example>
+            </div>
             <!-- 各行业项目规模占比 -->
             <div class="vip_component" style="height:11.2rem;background:url('/common-module/collection/image/buyer/07-bg.png') no-repeat;background-size:100% 100%">
               <p class="example-title">各行业项目规模占比</p>

+ 2 - 3
src/web/templates/pc/biddetail_rec.html

@@ -1346,8 +1346,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 		};
 	</script>
 	<script type="text/javascript">
-		// var canRead = {{.T.canRead}}
-		var canRead =false
+		var canRead = {{.T.canRead}}
 		//是否显示遮罩层
 		function checkShowDialog (res) {
 			var bidmember = false
@@ -1358,7 +1357,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			vip = res.data.vip
       privatedata = res.data.privatedata
 			var subType = {{.T.obj.subtype}}
-			
+
 			// if(subType == '采购意向' && !bidmember && !entniche && vip <=0){
 			// 	$(".com-prebuilt").removeClass("hidden");
 			// }