交易市场支付

pages.json

@@ -32,14 +32,14 @@
 				"navigationBarTextStyle": "white",
 				"app-plus":{
 					"titleNView": {
-						"backgroundColor": "#7c52fc",
+						"backgroundColor": "#8b64fd",
-						"buttons": [{
+						"buttons": [{
-							"text": "\ue603",
+							"text": "搜索",
-							"fontSrc":"/static/iconfont.ttf",
+							"fontSize": "14",
-							"background": "rgba(0,0,0,0)",
+							"color": "#fff"
-							"fontSize":"20"
 						}]
-					}
+					}
+					
 				}
 			}
 		}, {
@@ -342,7 +342,7 @@
 				"navigationBarTitleText": "权证详情",
 				"navigationBarTextStyle":"white",
 				"titleNView": {
-					"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)",
+					"backgroundColor": "#7c52fc",
 					"type": "transparent",
 					"buttons": [{
 						"text": "分享",

pages/equity/search.vue

@@ -11,19 +11,16 @@
 					<image class="tabs-item-arrow" src="@/static/icons/search_row.png" mode="" />
 				</view>
 				<view class="tabs-item" @click="onTabs">
-					<span :class="marketType === ''?'':'activess'">{{searchType == 0 ? '价格' : '信用值'}}</span>
+					<span :class="marketType === ''?'':'activess'">{{searchType == 0 ? '价格' : '价格'}}</span>
 					<image class="icon" mode="widthFix"
-						:src="require(marketType == 'asc' ? '@/static/icons/market_icon_low.png': '@/static/icons/market_icon_high.png')" />
+						:src="require(marketType == 'asc' ? '@/static/icons/market_icon_low.png':marketType == '' ? '@/static/icons/market_icon_null.png': '@/static/icons/market_icon_high.png')" />
 				</view>
 				<view class="tabs-item" @click="onPv">
 					<span :class="pvType === ''?'':'activess'">贡献值</span>
 					<image class="icon" mode="widthFix"
-						:src="require(pvType == 'asc' ? '@/static/icons/market_icon_low.png': '@/static/icons/market_icon_high.png')" />
+						:src="require(pvType == 'asc' ? '@/static/icons/market_icon_low.png': pvType == '' ? '@/static/icons/market_icon_null.png': '@/static/icons/market_icon_high.png')" />
 				</view>
-				<view class="tabs-item" v-if="searchType == 0" @click="pageUrl">全部分类
+				<view class="tabs-item" @click="pageUrl">全部分类
-					<image class="tabs-item-arrow" src="@/static/icons/search_row.png" mode="" />
-				</view>
-				<view class="tabs-item" v-if="searchType == 1" @click="companyOpne">{{companyName}}
 					<image class="tabs-item-arrow" src="@/static/icons/search_row.png" mode="" />
 				</view>
 			</view>
@@ -49,8 +46,8 @@
 			return {
 				nameVal: '',
 				searchArr: [],
-				marketType: 'asc', // 排序
+				marketType: '', // 排序
-				pvType:'asc',
+				pvType:'',
 				categoryArr: [], // 分类数组--企业
 				companyId: '', // 分类数组--企业id
 				companyName: '选择行业',
@@ -114,12 +111,12 @@
 			// 列表数据
 			getList() {
 				searchUrl('mall/goods', {
-					page: this.goodsPage,
 					order_by: this.marketType,
+					pv:this.pvType,
+					page: this.goodsPage,
 					industry_id: this.companyId,
 					name: this.nameVal,
 					is_self:this.goodsType[this.goodsTypeIndex].id,
-					pv:this.pvType
 				}).then(res => {
 					if (this.goodsPage === 1) {
 						this.searchArr = []

pages/goods/details.vue

@@ -87,7 +87,7 @@
 					<label class="title">服务</label>
 					<view class="goods-serve" @click="serveOpne">
 						<image class="goods-serve-img" src="../../static/icons/goods_buy.png" mode="aspectFill"></image>
-						<view class="nowrap goods-serve-name"><textv-for="(item, index) in goodsObj.services">{{item.name}}</text></view>
+						<view class="nowrap goods-serve-name"><text v-for="(item, index) in goodsObj.services" :key='item.service_id'>{{item.name}}</text></view>
 						<image class="goods-serve-img" src="../../static/icons/goods_spot.png" mode="aspectFill">
 						</image>
 					</view>
@@ -765,7 +765,7 @@
 
 				.coupons-left {
 					background-color: #fdedee;
-					color: #e1293f;
+					color: #aa55ff;
 					width: 190rpx;
 					text-align: center;
 					padding: $padding - 10 0;
@@ -818,7 +818,7 @@
 					top: 36rpx;
 					width: 110rpx;
 					text-align: center;
-					background-color: #e1293f;
+					background-color: #aa55ff;
 					color: #FFFFFF;
 					border-radius: 80rpx;
 					font-size: 24rpx;
@@ -833,7 +833,7 @@
 		}
 
 		.coupons-true {
-			background-image: linear-gradient(to right, #e1293f, #fd275d);
+			background-image: linear-gradient(to right, #aa55ff, #aa55ff);
 			color: #FFFFFF;
 			border-radius: 80rpx;
 			line-height: 84rpx;

pages/goods/lists.vue

@@ -6,16 +6,16 @@
 			{{goodsType[goodsTypeIndex].name}}
 				<image class="tabs-item-arrow" src="@/static/icons/search_row.png" mode="" />
 			</view>
-			<view class="tabs-item" :class="{'show': tabIndex == 0}" @click="onTabs" data-index="0">最新</view>
+			<!-- <view class="tabs-item" :class="{'show': tabIndex == 0}" @click="onTabs" data-index="0">最新</view> -->
-			<view class="tabs-item" :class="{'show': tabIndex == 1}" @click="onTabs" data-index="1">
+			<view class="tabs-item" :class="{'show': tabIndex == 1 && marketType !== ''}" @click="onTabs" data-index="1">
 				价格
 				<image class="icon" mode="widthFix"
-					:src="require(marketType == 'asc' ? '@/static/icons/market_icon_low.png': '@/static/icons/market_icon_high.png')" />
+					:src="require(marketType == 'asc' ? '@/static/icons/market_icon_low.png': marketType === ''? '@/static/icons/market_icon_null.png':'@/static/icons/market_icon_high.png')" />
 			</view>
-			<view class="tabs-item" :class="{'show': tabIndex == 2}" @click="onTabs" data-index="2">
+			<view class="tabs-item" :class="{'show': tabIndex == 2  && pvType !== ''}" @click="onTabs" data-index="2">
 				贡献值
 				<image class="icon" mode="widthFix"
-					:src="require(pvType == 'asc' ? '@/static/icons/market_icon_low.png': '@/static/icons/market_icon_high.png')" />
+					:src="require(pvType == 'asc' ? '@/static/icons/market_icon_low.png':  pvType === ''? '@/static/icons/market_icon_null.png':'@/static/icons/market_icon_high.png')" />
 			</view>
 		</view>
 		<view class="lists">
@@ -37,14 +37,14 @@
 		data() {
 			return {
 				tabIndex: 0,
-				marketType: 'asc',
+				marketType: '',
 				goods: [],
 				page: 1,
 				has_more: true,
 				isBaoDan: false, // 是否是报单，默认有id不是报单，无id是报单
 				goodsType: [],
 				goodsTypeIndex: 0,
-				pvType:'asc'
+				pvType:''
 			};
 		},
 		onReachBottom() {
@@ -86,7 +86,9 @@
 							this.has_more = true
 							this.page = 1
 							this.goods = []
-							this.tabIndex = ''
+							// this.tabIndex = ''
+							// this.pvType = ''
+							// this.marketType = ''
 							this.getList()
 						}
 					}
@@ -94,9 +96,19 @@
 			},
 			onTabs(e) {
 				let index = e.target.dataset.index
-				if (index == 0 && index == this.tabIndex) return
+				if (index == 0 ) {
-				if (index == 1 && index == this.tabIndex) this.marketType = this.marketType == 'asc' ? 'desc' : 'asc'
+					this.marketType = ''
-				if (index == 2 && index == this.tabIndex) this.pvType = this.pvType == 'asc' ? 'desc' : 'asc'
+					this.pvType = ''
+					return
+				}
+				if (index == 1 ) {
+					this.marketType = this.marketType == 'asc' ? 'desc' : 'asc' 
+					this.pvType = ''
+				}
+				if (index == 2 ) {
+					this.pvType = this.pvType === 'asc'? 'desc' :  'asc' 
+					this.marketType = ''
+				}
 				
 				this.tabIndex = index
 				this.has_more = true

uni_modules/uni-share/js_sdk/uni-share.js

@@ -31,9 +31,9 @@ class UniShare extends UniImageMenu{
 								super.hide()
 							},
 							fail: function(err) {
-								console.log("fail:" + JSON.stringify(err));
+								// console.log("fail:" + JSON.stringify(err))
 								uni.showModal({
-									content: JSON.stringify(err),
+									content: '分享失败了，检查下环境呗',
 									showCancel: false,
 									confirmText: "知道了"
 								});