公告相关

ghsApp/src/admin/picText/picTextList.vue

@@ -39,7 +39,7 @@
     </view>
 
     <view class="app-footer">
-      <button class="admin-button-com big blue" @click="addPicTextFn">{{ option.type == 3 ? '新增图文' : '新增说明' }}</button>
+      <button class="admin-button-com big blue" @click="addPicTextFn">新增图文</button>
     </view>
   </view>
 </template>

ghsApp/src/admin/picText/purchaseGuide.vue

@@ -19,13 +19,13 @@
     <view class="form-section">
       <view class="form-item textarea-item">
         <text class="form-label">公告标题</text>
-        <button class="admin-button-com mini-btn blue" style="float: right;" @click="purchaseGuideText=''">清空</button>
+        <button class="admin-button-com middle blue" style="float: right;" @click="purchaseGuideText=''">清空</button>
       </view>
       <view class="textarea-wrapper">
         <textarea 
           v-model="purchaseGuideText"
           class="textarea-input"
-          placeholder="请输入标题，不超过70个字"
+          placeholder="请输入标题，不超过70个字，标题为空，则显示一张图片"
           :placeholder-style="{ color: '#999999' }"
           :maxlength="500"
         />

ghsApp/src/pages.json

@@ -550,7 +550,7 @@
 				{"path": "picTextList","style": {"navigationBarTitleText": "图文"}},
 				{"path": "picTextAdd","style": {"navigationBarTitleText": "创建图文"}},
 				{"path": "preview","style": {"navigationBarTitleText": "图文预览"}},
-				{"path": "purchaseGuide","style": {"navigationBarTitleText": "购买须知"}}
+				{"path": "purchaseGuide","style": {"navigationBarTitleText": "商城公告"}}
 			]
 		}
 	],

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -13,12 +13,12 @@
 					</view>
 				</view>
 			</view>
-			
-			<image v-if="buyNotice == 1 && (ghsInfo.buyNoticeText == '' || ghsInfo.buyNoticeText == null)" :src="`${constant.hostUrl}/image/cg/buy_look2.png?v=1`" @click.stop="getReadMe(ghsInfo.shopId)" style="border-radius:10upx;margin-top:9upx;" mode="widthFix"></image>
-			<view class="notice-banner" @click.stop="getReadMe(ghsInfo.shopId)" v-if="ghsInfo.buyNoticeText != ''">
-				<text class="notice-text">{{ ghsInfo.buyNoticeText }}</text>
-			</view>
-
+			<block v-if="buyNotice == 1">
+				<image v-if="ghsInfo.buyNoticeText == '' || ghsInfo.buyNoticeText == null" :src="`${constant.hostUrl}/image/cg/buy_look2.png?v=1`" @click.stop="getReadMe(ghsInfo.shopId)" style="border-radius:10upx;margin-top:9upx;" mode="widthFix"></image>
+				<view class="notice-banner" @click.stop="getReadMe(ghsInfo.shopId)" v-else>
+					<text class="notice-text">{{ ghsInfo.buyNoticeText }}</text>
+				</view>
+			</block>
 		</view>
 
 		<view class="input-wrap" >
@@ -603,9 +603,6 @@ export default {
 					if(this.buyNotice == 1){
 						this.myClass = 'fadeIn'
 					}
-					if(this.ghsInfo.buyNoticeText!=''){
-						this.myClass = 'fadeIn'	
-					}
 					//获取供货商花材
 					if(id>0){
 						this.visitMall(id)
@@ -638,9 +635,6 @@ export default {
 					if(this.buyNotice == 1){
 						this.myClass = 'fadeIn'
 					}
-					if(this.ghsInfo.buyNoticeText!=''){
-						this.myClass = 'fadeIn'	
-					}
 					this.visitMall(this.option.id)
 					uni.setNavigationBarTitle({title: this.ghsInfo.name})
 					//不是新人或者已经下过单的或者活动没有开启不显示新人红