From 744e8358af46a4d53880ee49f666e5c07991bc6f Mon Sep 17 00:00:00 2001
From: da da <manggoya567@gmail.com>
Date: Mon, 15 May 2023 23:03:42 +0700
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/userInfo.js            | 25 +++++++++--
 main.js                    |  4 +-
 pages/ai/paint/paint.vue   |  6 +--
 pages/userInfo/vip/vip.vue | 90 ++++++++++++++++++++++++++++----------
 4 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/api/userInfo.js b/api/userInfo.js
index 7c11865..2ef01e6 100644
--- a/api/userInfo.js
+++ b/api/userInfo.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 const serviceTitle = '/img'
 const prefix = '/img/mini/tiktok'
-const prefix_vip = '/img/mini/vip/'
+const prefix_vip = '/img/mini/vip'
 //GET 传参需要用 params
 //POST 传参需要用 data
 
@@ -17,7 +17,26 @@ export function listTiktokCollection(data) {
 //获取会员list
 export function queryUserVipList() {
 	return request({
-		url: `${serviceTitle}${prefix}/queryUserVipList`,
-		method: 'get',
+		url: `${serviceTitle}${prefix_vip}/queryUserVipList`,
+		method: 'post',
+		data:{}
+	})
+}
+
+//获取会员orderid
+export function addVipOrder(data) {
+	return request({
+		url: `/order/vip/addVipOrder`,
+		method: 'post',
+		data
+	})
+}
+
+//获取抖音token
+export function unifiedOrder(data) {
+	return request({
+		url: `/pay/unified/unifiedOrder`,
+		method: 'post',
+		data
 	})
 }
diff --git a/main.js b/main.js
index b078a9f..fe6ed50 100644
--- a/main.js
+++ b/main.js
@@ -6,8 +6,8 @@ import common from './utils/common.js'
 // const baseURL = 'http://localhost:7010'
 // const baseURL = 'http://81.69.47.31:7010'
 // const baseURL = 'https://service.bnyer.cn'  //正式
-//const baseURL = 'http://47.108.66.163:7010'  //测试
-const baseURL = 'http://jbsu95.natappfree.cc' //本地
+const baseURL = 'http://47.108.66.163:7010'  //测试
+// const baseURL = 'http://jbsu95.natappfree.cc' //本地
 
 
 Vue.prototype.baseURL = baseURL;
diff --git a/pages/ai/paint/paint.vue b/pages/ai/paint/paint.vue
index f22a4f3..8787385 100644
--- a/pages/ai/paint/paint.vue
+++ b/pages/ai/paint/paint.vue
@@ -95,7 +95,7 @@
           <view class="form-item">
             <view class="form-label display-flex-sb">
               <view class="left-title">关键词相关性</view>
-              <view class="right-title">{{formData.sfgScale ?? 7}}</view>
+              <view class="right-title">{{formData.sfgScale || 7}}</view>
             </view>
             <slider :step="1" :min="0" :max="80" :block-size="12" :activeColor="primaryColor"
                     @change="(e) => {this.formData.sfgScale = (e.detail.value * 0.1 + 7).toFixed(1)}"
@@ -105,7 +105,7 @@
           <view class="form-item">
             <view class="form-label display-flex-sb">
               <view class="left-title">绘画步骤</view>
-              <view class="right-title">{{formData.steps ?? 20}}</view>
+              <view class="right-title">{{formData.steps || 20}}</view>
             </view>
             <slider :step="1" :min="20" :max="30" :block-size="12" :activeColor="primaryColor"
                     @change="(e) => {this.formData.steps = e.detail.value}"
@@ -115,7 +115,7 @@
           <view class="form-item">
             <view class="form-label display-flex-sb">
               <view class="left-title">差异强度</view>
-              <view class="right-title">{{formData.eta ?? 0}}</view>
+              <view class="right-title">{{formData.eta || 0}}</view>
             </view>
             <slider :step="1" :min="0" :max="10" :block-size="12" :activeColor="primaryColor"
                     @change="(e) => {this.formData.eta = (e.detail.value * 0.1).toFixed(1)}"
diff --git a/pages/userInfo/vip/vip.vue b/pages/userInfo/vip/vip.vue
index 20a4d69..2b95930 100644
--- a/pages/userInfo/vip/vip.vue
+++ b/pages/userInfo/vip/vip.vue
@@ -15,7 +15,8 @@
 		</view>
 
 		<view class="vip-box">
-			<view class="vip-box__item" :class="{'item-active':active == index}" @click="change(index)" v-for="(item,index) in vipList" :key="index">
+			<view class="vip-box__item" :class="{'item-active':active == index}" @click="change(index)"
+				v-for="(item,index) in vipList" :key="index">
 				<view class="title">
 					{{item.vipName}}
 				</view>
@@ -31,7 +32,7 @@
 			</view>
 		</view>
 
-		<button class="sumbit-btn">
+		<button class="sumbit-btn" @click="openVip" :disabled="disabled">
 			立即开通
 		</button>
 	</view>
@@ -39,24 +40,69 @@
 
 <script>
 	import {
-		queryUserVipList
+		queryUserVipList,
+		addVipOrder,
+		unifiedOrder
 	} from '@/api/userInfo.js'
 	export default {
 		data() {
 			return {
-				userInfo: null,
-				vipList:[],
-				active:0
+				userInfo: null,
+				vipList: [],
+				active: 0,
+				disabled: false
 			}
 		},
 		methods: {
 			async getVipList() {
-				const {data} = await queryUserVipList();
-				this.vipList = data.data
-				console.log(this.vipList)
-			},
-			change(index){
-				this.active = index
+				const {
+					data
+				} = await queryUserVipList();
+				this.vipList = data.data
+			},
+			change(index) {
+				this.active = index
+			},
+			async openVip() {
+				let data = this.vipList[this.active];
+				let phone = this.userInfo
+				if (!Object.keys(data).length) return
+				this.disabled = true
+				uni.showLoading({
+					title: "加载中..."
+				});
+				const res_add = await addVipOrder({
+					vipId: data.id
+				})
+				let orderNo = res_add.data.data;
+				const res_uni = await unifiedOrder({
+					orderNo,
+					sceneCode: 1,
+					payType: 'dypay',
+				})
+				let {orderId,orderToken} = res_uni.data.data.dyThirdInOrderVo
+				this.tikPay(orderId,orderToken)
+			
+			},
+			tikPay(order_id, order_token) {
+				tt.pay({
+					orderInfo: {
+						order_id,
+						order_token
+					},
+					service: 5,
+					success(res) {
+						if (res.code == 0) {
+						
+						}
+						uni.hideLoading();
+						this.disabled = false
+					},
+					fail(res) {
+						uni.hideLoading();
+						this.disabled = false
+					},
+				})
 			}
 		},
 		onShow() {
@@ -64,12 +110,12 @@
 		},
 		created() {
 			if (!this.userInfo) {
-				uni.navigateBack()
-				uni.showToast({
-					title: '请先登录',
-					icon: 'none'
+				uni.navigateBack()
+				uni.showToast({
+					title: '请先登录',
+					icon: 'none'
 				})
-			} 
+			}
 			this.getVipList()
 		}
 	}
@@ -127,7 +173,7 @@
 
 				.save-box {
 					border-radius: 30rpx;
-					width: 140rpx;
+					width: 150rpx;
 					height: 50rpx;
 					background-color: #e8f4ff;
 					font-size: 24rpx;
@@ -145,10 +191,10 @@
 				.price,
 				.title {
 					color: #fff;
-				}
-				
-				.o-price{
-					color: #eee;
+				}
+
+				.o-price {
+					color: #eee;
 				}
 
 				.save-box {