修改配置

components/canvasShow/basics/live/app/item.vue

@@ -197,6 +197,8 @@ export default {
       }
     },
     toLive() {
+      console.log(liveAppid,'liveAppid')
+      console.log(this.liveData.roomId,'this.liveData.roomId')
 			if (!liveAppid || !this.liveData) { return }
 			// 跳转直播间携带路由参数
 			// let customParams = encodeURIComponent(JSON.stringify({ path: 'livePage/index', pid: 1 }))

config/api.js

@@ -24,7 +24,9 @@ const TERMINAL = 1
 module.exports = {
 	terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
 	SettledMerchantPrefix: DOMAIN_PREFIX + '/settled-merchant', //商家入驻链接
-	shareLink: DOMAIN_PREFIX + '/h5', // 分享地址
+	// shareLink: DOMAIN_PREFIX + '/h5', // 分享地址
+	shareLink: 'https://ceres.zkthink.com/h5', // 分享地址
+
 	//登录注册
 	Verify: WX_API_BASE + '/app/getCode', //  获取短信验证码
 	Login: WX_API_BASE + '/app/login', //  手机号验证码登录、注册
@@ -196,7 +198,7 @@ module.exports = {
 	getProblemDetail: WX_API_BASE + '/seckill/getProblemDetail', //问答详情查询
 	getQueryPlatformSeckillList: WX_API_BASE + '/platform-seckill/queryPlatformSeckillList', //平台秒杀列表
 	getPlatformSeckills: WX_API_BASE + '/canvas/getPlatformSeckills', //根据seckillId查询对应的秒杀商品列表
-	
+
 	//拼团专区
 	getGroupSettlement: WX_API_BASE + '/work/getSettlement', //拼团单结算查询
 	getGroupBuyList: WX_API_BASE + '/work/getIndex', //拼团专区首页数据查询

manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "cereshop",
-    "appid" : "__UNI__B04DFAC",
+    "appid" : "__UNI__ECAA86F",
     "description" : "cereshop",
-    "versionName" : "1.7.2",
-    "versionCode" : 172,
+    "versionName" : "1.7.4",
+    "versionCode" : 174,
     "transformPx" : false,
     "app-plus" : {
         "kernel" : {
@@ -39,16 +39,13 @@
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]

pages/tabbar/user/index.vue

@@ -39,9 +39,6 @@
           <view class="user-logoin-title"
                 v-if="useritem.name">{{ useritem.name }}
           </view>
-          <view class="user-logoin-title"
-                v-else>{{ infoitem.phone }}
-          </view>
           <view class="experience flex-items"
                 @click="goToMemberCenter">
             <label>成长值</label>
@@ -263,7 +260,6 @@ export default {
   data() {
     return {
       item: {},
-      infoitem: {},
       useritem: {},
       isLoading: false,
       corpId: null,
@@ -276,7 +272,6 @@ export default {
     if (uni.getStorageSync('storage_key')) {
       this.item = uni.getStorageSync('storage_key');
     }
-    this.getInfo()
     this.GetUser()
   },
   methods: {
@@ -344,16 +339,6 @@ export default {
 
       })
     },
-    // 获取会员信息
-    getInfo() {
-      NET.request(API.Info, {
-        token: this.item.token,
-      }, 'GET').then(res => {
-        this.infoitem = res.data
-      }).catch(res => {
-
-      })
-    },
     // 个人信息  登录页面
     gologin() {
       uni.navigateTo({
@@ -362,8 +347,7 @@ export default {
     },
     goinfo() {
       uni.navigateTo({
-        url: '../../../pages_category_page2/userModule/personalDetails?infoitem=' + JSON.stringify(this
-            .infoitem)
+        url: '../../../pages_category_page2/userModule/personalDetails'
       })
     },
     // 我的评论

pages_category_page1/orderModule/index.vue

@@ -615,18 +615,15 @@ export default {
       // #endif
       // #ifdef APP-PLUS
       NET.request(API.gotoAppPay, submitResult, 'POST').then(res => {
-        let str = res.data.package
-        var index = str.lastIndexOf("\=");
-        str = str.substring(index + 1, str.length);
-        var obj = {
-          appid: res.data.appId,
-          noncestr: res.data.nonceStr,
-          package: 'Sign=WXPay',
-          prepayid: str,
-          timestamp: res.data.timeStamp,
-          sign: 'MD5',
-          partnerid: res.data.partnerId
-        }
+		var obj = {
+		  appid: res.data.appId,
+		  noncestr: res.data.nonceStr,
+		  package: 'Sign=WXPay',
+		  prepayid: res.data.prepayId,
+		  timestamp: res.data.timeStamp,
+		  sign: res.data.paySign,
+		  partnerid: res.data.partnerId
+		}
         uni.requestPayment({
           provider: 'wxpay',
           orderInfo: obj,

pages_category_page1/orderModule/orderConfirm.vue

@@ -650,7 +650,7 @@ export default {
 				}
 			})
 		},
-		
+
     addAddressTap() {
 			console.log(this.type, 'this.type')
       uni.navigateTo({
@@ -1198,7 +1198,6 @@ export default {
                     url: '../orderModule/index?type=1'
                   })
                 })
-
               }
               // #endif
               // #ifdef MP-ALIPAY
@@ -1271,24 +1270,20 @@ export default {
               //console.log(submitResult, 'app-submitResult')
               NET.request(API.gotoAppPay, submitResult, 'POST').then(res => {
                 uni.hideLoading()
-                let str = res.data.package
-                var index = str.lastIndexOf("\=");
-                str = str.substring(index + 1, str.length);
                 var obj = {
                   appid: res.data.appId,
                   noncestr: res.data.nonceStr,
                   package: 'Sign=WXPay',
-                  prepayid: str,
+                  prepayid: res.data.prepayId,
                   timestamp: res.data.timeStamp,
-                  sign: 'MD5',
+                  sign: res.data.paySign,
                   partnerid: res.data.partnerId
                 }
-                //console.log(res.data, '111')
-                //console.log(obj, '111')
                 uni.requestPayment({
                   provider: 'wxpay',
                   orderInfo: obj,
                   success: function (payRes) {
+										console.log('支付成功',payRes)
                     uni.showToast({
                       icon: 'none',
                       title: '支付成功'
@@ -1299,6 +1294,7 @@ export default {
                   },
                   fail: function (err) {
                     //console.log(err)
+										console.log('支付失败',err)
                     uni.showToast({
                       icon: 'none',
                       title: '支付取消'
@@ -1309,6 +1305,7 @@ export default {
                   }
                 })
               }).catch(err => {
+								console.log(err, 'catch支付失败')
                 uni.hideLoading()
                 uni.showToast({
                   title: '支付失败',

pages_category_page1/orderModule/orderDetails.vue

@@ -784,20 +784,15 @@
 				// #endif
 				// #ifdef APP-PLUS
 				NET.request(API.gotoAppPay, submitResult, 'POST').then(res => {
-					let str = res.data.package
-					var index = str.lastIndexOf("\=");
-					str = str.substring(index + 1, str.length);
 					var obj = {
-						appid: res.data.appId,
-						noncestr: res.data.nonceStr,
-						package: 'Sign=WXPay',
-						prepayid: str,
-						timestamp: res.data.timeStamp,
-						sign: 'MD5',
-						partnerid: res.data.partnerId
+					  appid: res.data.appId,
+					  noncestr: res.data.nonceStr,
+					  package: 'Sign=WXPay',
+					  prepayid: res.data.prepayId,
+					  timestamp: res.data.timeStamp,
+					  sign: res.data.paySign,
+					  partnerid: res.data.partnerId
 					}
-					console.log(res.data, '111')
-					console.log(obj, '111')
 					uni.requestPayment({
 						provider: 'wxpay',
 						orderInfo: obj,