Merge branch 'develop' of https://gitee.com/qinxingxing/alpha-shopping into develop

# Conflicts:
#	manifest.json
This commit is contained in:
2025-11-25 21:17:48 +08:00
5 changed files with 6 additions and 13 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
{ {
"customPlaygroundType" : "local", "customPlaygroundType" : "local",
"packageName" : "com.trustbridge.mm", "packageName" : "com.trustbridge.mm",
"playground" : "custom", "playground" : "standard",
"type" : "uni-app:app-android" "type" : "uni-app:app-android"
}, },
{ {
-8
View File
@@ -1,11 +1,3 @@
/*
* @Author: 秦彦祖 605893810@qq.com
* @Date: 2025-11-18 17:06:49
* @LastEditors: 秦彦祖 605893810@qq.com
* @LastEditTime: 2025-11-18 23:19:56
* @FilePath: /alpha-shopping/main.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import App from './App' import App from './App'
import messages from './locale/index' import messages from './locale/index'
import uviewPlus from '@/uni_modules/uview-plus' import uviewPlus from '@/uni_modules/uview-plus'
+1 -1
View File
@@ -3,7 +3,7 @@
"appid" : "__UNI__4910728", "appid" : "__UNI__4910728",
"description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城;通过“有趣”“有利”“有希望”的卖货玩法,吸引消费者、推广者、商家、投资人参与生态,共同打造共创共享的全球产业生态。", "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城;通过“有趣”“有利”“有希望”的卖货玩法,吸引消费者、推广者、商家、投资人参与生态,共同打造共创共享的全球产业生态。",
"versionName" : "1.0.1", "versionName" : "1.0.1",
"versionCode" : 144, "versionCode" : 145,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
+3 -2
View File
@@ -315,8 +315,9 @@ export default {
success:(res1=>{ success:(res1=>{
if(res1.confirm){ if(res1.confirm){
let arr = res.data.split('?id='); let arr = res.data.split('?id=');
console.log('arr') console.log('arr',arr, Number(arr[1]))
_this.curId = Number(arr[1]); const id = arr[1].split(' ');
_this.curId = Number(id[0]);
_this.getShop(); _this.getShop();
uni.setClipboardData({ uni.setClipboardData({
data: '', data: '',
@@ -610,7 +610,7 @@ export default {
}, },
getValue, getValue,
onShare(index){ onShare(index){
let tmp = `【信任桥】消费共享数字化权益 ${SHARE_URL}/#/pages/other_package/productInfo/productInfo?id=${this.id} ${this.orderInfo.name}`; let tmp = `【信任桥】消费共享数字化权益 ${SHARE_URL}/#/pages/other_package/productInfo/productInfo?id=${this.id} ${this.orderInfo.name}`;
if(index == 0){ if(index == 0){
// WXSceneTimeline // WXSceneTimeline
uni.share({ uni.share({