Merge branch 'master' into dev_techan

App.vue

@@ -8,8 +8,8 @@
 			uni.setStorageSync('SHFlag', true)
 			this.Post({id:2388},'/api/multimedia/detail').then(res => {
 				if (res && res.data) {
-					let SHFlag = res.data.company_name == 1 ? true : false
-					// let SHFlag = res.data.ext_link == 1 ? true : false
+					// let SHFlag = res.data.company_name == 1 ? true : false
+					let SHFlag = res.data.ext_link == 1 ? true : false
 					uni.setStorageSync('SHFlag', SHFlag)
 					return
 				} else {

pages.json

@@ -337,6 +337,12 @@
 				"style": {
 					"navigationBarTitleText" : "水八仙之首—苏州芡实 (鸡头米)"
 				}
+			},
+			{
+				"path": "activity/coffeeClub",
+				"style": {
+					"navigationBarTitleText" : ""
+				}
 			}
 		]
 	}],

subPackages/activity/coffeeClub.vue

@@ -0,0 +1,51 @@
+<template>
+	<view class="bg">
+		<image v-if="headImg" :src="showImg(headImg)" class="topImg" mode="widthFix"></image>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				headImg: '',
+			}
+		},
+		onLoad(option) {
+			
+		},
+		onReady() {
+			this.getHeadImg(2392)
+			
+		},
+		methods: {
+			getHeadImg (id) {
+				this.Post({id},'/api/multimedia/detail').then(res => {
+					this.headImg = res.data.head_img
+					uni.setNavigationBarTitle({
+						title:res.data.title
+					})
+				});	
+			},
+			
+			
+			
+			
+		},
+		onPageScroll(res) {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		width: 750rpx;
+		min-height: 100vh;
+	}
+	
+	.topImg {
+		width: 100%;
+	}
+</style>

subPackages/search/techanResult.vue

@@ -16,11 +16,12 @@
 					<text :class="[search_type==0?'active-search-item':'']" @click="changeSearchParm(0)">综合</text>
 				</view>
 				<view >
-					<text :class="[[1,2].includes(search_type)?'active-search-item':'']" @click="changeSearchParm(search_type==1?2:1)">销量</text>
+					<!-- <text :class="[[1,2].includes(search_type)?'active-search-item':'']" @click="changeSearchParm(search_type==1?2:1)">销量</text>
 					<view class="search-item">
 						<view :class="[search_type==1?'active-search-item':'','triangle-up']" @click="changeSearchParm(1)">▼</view>
 						<view :class="[search_type==2?'active-search-item':'']" @click="changeSearchParm(2)">▼</view>
-					</view>
+					</view> -->
+					<text :class="[[1,2].includes(search_type)?'active-search-item':'']" @click="changeSearchParm(2)">销量</text>
 				</view>
 				<view >
 					<text :class="[[3,4].includes(search_type)?'active-search-item':'']" @click="changeSearchParm(search_type==3?4:3)">价格</text>

subPackages/techan/index.vue

@@ -43,11 +43,12 @@
 							<text :class="[search_type==0?'active-search-item':'']" @click="changeSearchParm(0)">综合</text>
 						</view>
 						<view >
-							<text :class="[[1,2].includes(search_type)?'active-search-item':'']" @click="changeSearchParm(search_type==1?2:1)">销量</text>
+							<!-- <text :class="[[1,2].includes(search_type)?'active-search-item':'']" @click="changeSearchParm(search_type==1?2:1)">销量</text>
 							<view class="search-item">
 								<view :class="[search_type==1?'active-search-item':'','triangle-up']" @click="changeSearchParm(1)">▼</view>
 								<view :class="[search_type==2?'active-search-item':'']" @click="changeSearchParm(2)">▼</view>
-							</view>
+							</view> -->
+						<text :class="[[1,2].includes(search_type)?'active-search-item':'']" @click="changeSearchParm(2)">销量</text>
 						</view>
 						<view >
 							<text :class="[[3,4].includes(search_type)?'active-search-item':'']" @click="changeSearchParm(search_type==3?4:3)">价格</text>