cmy 5 місяців тому
батько
коміт
1fbf971424
5 змінених файлів з 31 додано та 17 видалено
  1. 1 1
      config/app.js
  2. 3 2
      manifest.json
  3. 21 8
      pages/money/recharge.vue
  4. 5 5
      pages/user/user.vue
  5. 1 1
      store/index.js

+ 1 - 1
config/app.js

@@ -1,7 +1,7 @@
 module.exports = {
 	// 请求域名 格式: https://您的域名
 	
-	HTTP_REQUEST_URL:'http://base.liuniu946.com',
+	HTTP_REQUEST_URL:'https://drt.qiniu1314.com',
 
 	
 	

+ 3 - 2
manifest.json

@@ -1,10 +1,11 @@
 {
     "name" : "滇润堂",
-    "appid" : "__UNI__E0158B1",
+    "appid" : "__UNI__EE81E6D",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
+    "sassImplementationName" : "node-sass",
     "app-plus" : {
         /* 5+App特有相关 */
         "usingComponents" : true,
@@ -58,7 +59,7 @@
     "mp-weixin" : {
         /* 小程序特有相关 */
         "usingComponents" : true,
-        "appid" : "wx1fc72714ab0fde17",
+        "appid" : "wx4729eb00e2681523",
         "setting" : {
             "urlCheck" : true,
             "minified" : true

+ 21 - 8
pages/money/recharge.vue

@@ -86,6 +86,9 @@
 				// #ifdef H5
 				type: 'weixin',
 				// #endif
+				// #ifdef MP
+				type: 'weixin',
+				// #endif
 				money: '', //充值金额
 				payLoding: false, //是否加载中
 				// #ifdef H5
@@ -191,10 +194,22 @@
 					from: this.type,
 					rechar_id: this.chooseId
 				}).then(e => {
-					uni.requestPayment({
-						provider: 'wxpay',
-						orderInfo: e.data.data,
-						success: function() {
+					console.log(e,'eeeeee')
+					const da = {
+						appId:e.data.appId,
+						nonceStr:e.data.nonceStr,
+						package:e.data.package,
+						signType:e.data.signType,
+						timeStamp:e.data.timestamp,
+						paySign:e.data.paySign
+					}
+					wx.requestPayment({
+						timeStamp: da.timeStamp,
+						nonceStr: da.nonceStr,
+						package: da.package,
+						signType: da.signType,
+						paySign: da.paySign,
+						success: function(res) {
 							uni.showToast({
 								title: '充值成功',
 								duration: 2000,
@@ -210,10 +225,8 @@
 									console.log(e);
 								});
 							obj.payLoding = false;
-						},
-						fail(e) {
-							obj.payLoding = false;
-							console.log(e);
+						},fail(err) {
+							console.log(err)
 						}
 					});
 				})

+ 5 - 5
pages/user/user.vue

@@ -125,11 +125,11 @@
 						<view class="title">已经为您定制专属客服</view>
 						<image src="../../static/img/img010.png" mode=""></image>
 					</view>
-					<view class="nocancel">客服1VX:{{ text1 }}</view>
-					<view class="nocancel">客服2VX:{{ text2 }}</view>
+					<view class="nocancel">客服VX:{{ text1 }}</view>
+					<!-- <view class="nocancel">客服2VX:{{ text2 }}</view> -->
 					<view class="comfirm-box">
-						<view class="cancel" @click="comfirm(text1)">复制客服1</view>
-						<view class="comfirm" @click="comfirm(text2)">复制客服2</view>
+						<view class="cancel" @click="comfirm(text1)">复制客服</view>
+						<!-- <view class="comfirm" @click="comfirm(text2)">复制客服2</view> -->
 					</view>
 				</view>
 			</view>
@@ -169,7 +169,7 @@
 				achievement: '',
 				code: '',
 				levelList: [],
-				text1: 'yangqianqian131419', //客服1微信
+				text1: '17857143114', //客服1微信
 				text2: 'AHFM134', //客服2微信
 			};
 		},

+ 1 - 1
store/index.js

@@ -6,7 +6,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL: 'https://drt.liuniukj.com', //请求地址配置 
+		baseURL: 'https://drt.qiniu1314.com', //请求地址配置 
 		urlFile: '/index', //项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor: false, //是否打开强制登录