Merge branch 'dongjian' into develop

api/contract.js

@@ -24,3 +24,11 @@ export function contractInfo(data) {
 		data
 	  });
 }
+export function quickens(data) {
+	// return request.post('/common/getSmsCode',qs.stringify(params));
+	return request({
+	    url: "/finance/getQuickens",
+	    method: "get",
+		data
+	  });
+}

components/common/down-popup.vue

@@ -75,6 +75,7 @@
 		},
 		methods: {
 			onCancel(){
+				
 				this.$emit('cancel');
 			},
 			onOk(){

pages/order_package/order_submit/order_submit.vue

@@ -234,9 +234,13 @@ export default {
 			this.wayShow = type;
 		},
 		async getWayOption() {
-			const result = await getSupportPay();
+			let parmas = {
+				type:4
+			}
+			const result = await getSupportPay(parmas);
 			if (result && result.bizcode === 100) {
 				const data = result.data || [];
+				console.log('getWayOption',data)
 				const amount = this.orderInfo.amount;
 				let flag = data.some(item => ['wechat', 'alipay'].includes(item.type));
 				// 没有支付宝和微信支付

pages/other_package/pointsRedemption/pointsRedemption.vue

@@ -87,7 +87,7 @@
 			async getSearchList(){
 				this.productListLoading = true;
 				const params = {
-					type:SEARCH_TYPE.EXPLOSIVE,
+					type:3,
 					page:1,
 					pageSize:99,
 				}
@@ -110,7 +110,7 @@
 			 */
 			jumpInfo(item){
 				uni.navigateTo({
-				    url: '/pages/other_package/productInfo/productInfo?id='+item.id,
+				    url: `/pages/other_package/productInfo/productInfo?id=${item.id}&ji=1`,
 				})
 			}
 		}

pages/other_package/productInfo/productInfo.vue

@@ -104,15 +104,15 @@
 						@click="serviceShow = true;"></up-image>
 					<view>咨询</view>
 				</view>
-				<view class="left_item">
+				<view class="left_item" v-if="!ji">
 					<up-image src="/static/product/cart.png" width="24" height="20" bgColor="#f1f6ff00"
 						@click="jumpOther('cart')"></up-image>
 					<view>购物车</view>
 				</view>
 			</view>
 			<view class="product_but_right">
-				<view class="but_comm join_warp" @click="checkSpecification(true, 'addCart')">加入购物车</view>
+				<view v-if="!ji" class="but_comm join_warp" @click="checkSpecification(true, 'addCart')">加入购物车</view>
-				<view class="but_comm buy_warp" @click="checkSpecification(true, 'buy')">立即购买</view>
+				<view class="but_comm buy_warp" :class="{'border-16':ji}" @click="checkSpecification(true, 'buy')">立即购买</view>
 			</view>
 		</view>
 		<!-- 选择规格的弹框 -->
@@ -269,11 +269,15 @@ export default {
 			serviceShow: false,// 联系客服弹框
 			openShow: false,
 			source: null,// 来源：供应链，自营
+			ji:0
 		}
 	},
 	onLoad(options) {
 		const id = options.id;
 		const source = options.source;
+		if(options.ji){
+			this.ji = 1;
+		}
 		if (id && id !== 0) {
 			this.id = id ? parseInt(id, 10) : 0;
 			if (source && source === 'supply_chain') {
@@ -524,6 +528,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+	.border-16{
+		border-radius: 16rpx !important;
+	}
 .product_info_warp {
 	height: calc(100vh - 196rpx);
 	background-color: $app-bj;

pages/sort/sort.vue

@@ -40,7 +40,7 @@
 							<text>{{ item.name }}</text>
 						</view>
 						<view class="item-container" v-if="item.foods && item.foods.length !== 0">
-							<view class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1" @click="jumpSearch(item1)">
+							<view class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1" @click="jumpInfo(item1)">
 								<image class="item-menu-image" :src="item1.icon ? item1.icon : '/static/common/def_img.jpg'" mode="">
 								</image>
 								<view class="item-menu-name">{{ item1.name }}</view>
@@ -132,6 +132,12 @@ export default {
 			uni.navigateTo({
 				url: '/pages/shop/search',
 			})
+		
+		},
+		jumpInfo(item){
+			uni.navigateTo({
+			    url: `/pages/other_package/productInfo/productInfo?id=${item.id}`,
+			})
 		},
 		// 查询分类
 		async getSort(pId) {

pages/user/jia.vue

@@ -54,6 +54,7 @@
 			 <!-- (2)转盘抽奖获得 -->
 		</view>
 		<!-- <DownPopup :show="true"></DownPopup> -->
+		<up-toast ref="uToastRef"></up-toast>
 	</view>
 </template>
 
@@ -62,7 +63,7 @@ import { getUserInfo } from '@/api/auth.js';
 import Header from '@/components/common/header.vue';
 import TopSafe from '@/components/common/top-safe.nvue'
 import DownPopup from '@/components/common/down-popup.vue';
-import { getContractList,signContract } from '@/api/contract.js'
+import { quickens } from '@/api/contract.js'
 
 import func from '@/utils/func.js';
 
@@ -81,38 +82,33 @@ export default {
 			],
 			tableHead:['加速比例','释放TBC数量','时间'],
 			tableList:[
-				{one:'12%',two:'888',three:'2022-12-15'},
+				
-				{one:'12%',two:'888',three:'2022-12-15'},
-				{one:'12%',two:'888',three:'2022-12-15'},
-				{one:'12%',two:'888',three:'2022-12-15'},
 			]
 		};
 	},
-	onShow() {
+	onLoad() {
-		// this.init();
+		this.init();
 	},
 	methods: {
 		init(){
 			// this.isSignContract()
-			this.getSignContract()
+			this.getQuichens()
 		},
-		isSignContract(){
+		getQuichens(){
-			signContract().then(res=>{
+			quickens().then(res=>{
 				if(res.bizcode == 100){
-					this.type = res.data;
+					// this.type = res.data;
-				}else{
+					this.tList[0].text = res.data.vcoinsLock;
-					this.$refs.uToastRef.show({
+					this.tList[1].text = res.data.quickenBalance;
-						type: 'error',
+					this.topList[0].value = res.data.quickenTotal;
-						message: res.msg,
+					this.topList[1].value = res.data.quickenValue;
-					});
+					this.topList[2].value = res.data.quickenBalance;
-				}
+					this.tableList = res.data.quickenDetail;
+					this.tableList.forEach(item=>{
+						item.one = item.quickenRate * 100 + '%';
+						item.two = item.quickenValue;
+						item.three = func.formatDate(new Date(item.ctdate), 3)
 					})
-		},
-		getSignContract(){
-			getContractList().then(res=>{
-				if(res.bizcode == 100){
-					this.obj = res.data[0];
-					this.obj.time = func.formatDate(new Date(res.data[0].signatureTime),3)
 				}else{
 					this.$refs.uToastRef.show({
 						type: 'error',
@@ -121,6 +117,7 @@ export default {
 				}
 			})
 		},
+		
 		onBtn(){
 			if(this.type){
 				//查看