charles/frontend-app
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	utils/config.js
This commit is contained in:
money
2025-11-20 10:33:54 +08:00
parent d0d501646c 7844b9b827
commit f5a82837ed
131 changed files with 247 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/home/home.vue
+9 -9
View File
@@ -4,11 +4,11 @@
<view class="home_header_warp"></view>
<view class="home_content_z_warp">
<view class="header_title_warp">
<!-- <up-image src="/static/home/logo.png" width="86" height="30" bgColor="#f1f6ff00"></up-image> -->
<!-- <up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/logo.png" width="86" height="30" bgColor="#f1f6ff00"></up-image> -->
<!-- <view class="header_right_warp"> -->
<view class="language_warp" style="width: 100%;justify-content: flex-start;" @click="jumpSearch">
<view style="margin-top: 10rpx;">
<up-image src="/static/home/search_b.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/search_b.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
</view>
<text class="search_msg_warp">搜索</text>
</view>
@@ -39,7 +39,7 @@
<!-- logo分类 -->
<view class="logo_banner">
<view style="padding: 20rpx 0 0 20rpx;">
<up-image src="/static/home/logo_banner.png" width="108" height="16" bgColor="#f1f6ff00"></up-image>
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/logo_banner.png" width="108" height="16" bgColor="#f1f6ff00"></up-image>
<view class="logo_banner_title">TB聚合商城</view>
<view class="logo_banner_msg">MALL+RWA+DAO的共创共享全球产业生态</view>
</view>
@@ -70,7 +70,7 @@
<view class="product_title">
<view class="product_title_left">
<text class="product_title_yp">信任桥优品</text>
<up-image src="/static/home/youxuan.png" width="10" height="10" bgColor="#f1f6ff00"></up-image>
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/youxuan.png" width="10" height="10" bgColor="#f1f6ff00"></up-image>
<text style="margin-left: 6rpx;color: #FFFFFF;">品牌5折秒杀福利</text>
</view>
<view class="product_title_f" style="font-weight: bold;" >
@@ -97,7 +97,7 @@
<view class="min_card_warp">
<!-- 积分兑换 -->
<view class="min_card_item" @click="jumpIntegral">
<!-- <up-image src="/static/home/min_card_jfdh.png" width="60" height="14" bgColor="#f1f6ff00" ></up-image> -->
<!-- <up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/min_card_jfdh.png" width="60" height="14" bgColor="#f1f6ff00" ></up-image> -->
<view class="min_card_item_content">
<view class="min_card_item_title">信任桥兑换</view>
<view class="content_msg">
@@ -109,11 +109,11 @@
</view>
</view>
</view>
<up-image src="/static/home/min_card_jfdh_2.png" width="66" height="66" bgColor="#f1f6ff00"></up-image>
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/min_card_jfdh_2.png" width="66" height="66" bgColor="#f1f6ff00"></up-image>
</view>
<!-- 红包抽奖 -->
<view class="min_card_item" @click="jumpTurntable">
<!-- <up-image src="/static/home/min_card_hbcj.png" width="60" height="14" bgColor="#f1f6ff00" ></up-image> -->
<!-- <up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/min_card_hbcj.png" width="60" height="14" bgColor="#f1f6ff00" ></up-image> -->
<view class="min_card_item_content">
<view class="min_card_item_title">红包抽奖</view>
<view class="content_msg">
@@ -125,7 +125,7 @@
</view>
</view>
</view>
<up-image src="/static/home/min_card_hbcj_2.png" width="66" height="66" bgColor="#f1f6ff00"></up-image>
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/min_card_hbcj_2.png" width="66" height="66" bgColor="#f1f6ff00"></up-image>
</view>
</view>
<!-- 好物优选 -->
@@ -176,7 +176,7 @@
</view>
</view>
</up-modal>
<!-- #ifndef H5 -->
<!-- #ifndef H5 || MP-WEIXIN-->
<CustomTabBar :tabIndex="0" />
<!-- #endif -->
<up-action-sheet :actions="languageList" :show="languageShow" cancelText="取消"
pages/mine/mine.vue
+27 -27
View File
@@ -10,7 +10,7 @@
:src="
currentUserData.avatarUrl
? currentUserData.avatarUrl
: '/static/mine/avatar.png'
: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/avatar.png'
"
shape="circle"
width="54"
@@ -24,7 +24,7 @@
}}</text>
<view class="level" @click="jumpToTrustBridge">
<up-image
src="/static/mine/rz.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/rz.png"
style="margin-right: 8rpx; margin-top: 6rpx"
shape="circle"
width="12"
@@ -65,7 +65,7 @@
</view>
<view @click="jumpSetting">
<up-image
src="/static/mine/icon_arrow_black_off.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/icon_arrow_black_off.png"
width="22"
height="22"
bgColor="#f1f6ff00"
@@ -160,7 +160,7 @@
<view class="enter_item" @click="jumpEnter('merchant')">
<view class="enter_item_cell">
<up-image
src="/static/mine/enter_sj.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/enter_sj.png"
width="36"
height="36"
bgColor="#f1f6ff00"
@@ -186,7 +186,7 @@
<view class="enter_item" @click="jumpEnter('brand')">
<view class="enter_item_cell">
<up-image
src="/static/mine/enter_pp.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/enter_pp.png"
width="36"
height="36"
bgColor="#f1f6ff00"
@@ -233,7 +233,7 @@
</view>
</view>
</view>
<!-- #ifndef H5 -->
<!-- #ifndef H5 || MP-WEIXIN-->
<CustomTabBar :tabIndex="4" />
<!-- #endif -->
<!-- 品牌入驻弹框 -->
@@ -334,7 +334,7 @@ export default {
{
id: ORDER_TYPE.UNPAID,
title: "待支付",
url: "/static/mine/order_unpaid.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/order_unpaid.png",
path:
"/pages/mine_package/mine_order/mine_order?type=" +
MINE_ORDER_TYPE.UNPAID,
@@ -343,7 +343,7 @@ export default {
{
id: ORDER_TYPE.UNSHIPPED,
title: "待发货",
url: "/static/mine/order_unshipped.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/order_unshipped.png",
path:
"/pages/mine_package/mine_order/mine_order?type=" +
MINE_ORDER_TYPE.UNSHIPPED,
@@ -352,7 +352,7 @@ export default {
{
id: ORDER_TYPE.NOT_RECEIVE,
title: "待收货",
url: "/static/mine/order_notReceive.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/order_notReceive.png",
path:
"/pages/mine_package/mine_order/mine_order?type=" +
MINE_ORDER_TYPE.NOT_RECEIVE,
@@ -361,7 +361,7 @@ export default {
{
id: ORDER_TYPE.SUCCEED,
title: "已完成",
url: "/static/mine/order_afterSale.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/order_afterSale.png",
path:
"/pages/mine_package/mine_order/mine_order?type=" +
MINE_ORDER_TYPE.SUCCEED,
@@ -370,7 +370,7 @@ export default {
{
id: ORDER_TYPE.AFTER_SALE,
title: "售后",
url: "/static/new/shouhou.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/shouhou.png",
path:
"/pages/mine_package/mine_order/mine_order?type=" +
MINE_ORDER_TYPE.AFTER_SALE,
@@ -381,25 +381,25 @@ export default {
{
id: 1,
title: "钱包",
url: "/static/mine/apply_purse.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/apply_purse.png",
path: "/pages/mine_package/mine_purse/mine_purse",
},
{
id: 2,
title: "抽奖",
url: "/static/mine/apply_prize.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/apply_prize.png",
path: "/pages/other_package/nine-grid/nine-grid",
},
{
id: 4,
title: "我的推广",
url: "/static/mine/tool_team.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_team.png",
path: "/pages/mine_package/mine_my_team/mine_my_team",
},
{
id: 5,
title: "加速次数",
url: "/static/mine/tool_js.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_js.png",
path: "/pages/rwa_package/dongjian/jia",
},
// {
@@ -410,35 +410,35 @@ export default {
// {
// id:4,
// title:"贡献值",
// url:'/static/mine/apply_gx.png'
// url:'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/apply_gx.png'
// },{
// id:5,
// title:"数据",
// url:'/static/mine/apply_sj.png'
// url:'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/apply_sj.png'
// },
], // 应用模版
toolList: [
{
id: 5,
title: "地址管理",
url: "/static/mine/tool_dz.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_dz.png",
path: "/pages/mine_package/mine_address/mine_address",
},
{
id: 9,
title: "实名认证",
url: "/static/mine/tool_sm.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_sm.png",
},
{
id: 10,
title: "账户管理",
url: "/static/mine/tool_card.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_card.png",
path: "/pages/rwa_package/account/index",
},
{
id: 3,
title: "邀请好友",
url: "/static/mine/tool_invite.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_invite.png",
path: "/pages/other_package/invite_friends/invite_friends",
},
// {
@@ -450,13 +450,13 @@ export default {
// {
// id:6,
// title:"卡券",
// url:'/static/mine/tool_kj.png',
// url:'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_kj.png',
// // path:"/pages/mine_package/mine_coupon/mine_coupon",
// },
{
id: 7,
title: "联系客服",
url: "/static/mine/xlkf.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/xlkf.png",
},
// {
// id:4,
@@ -467,25 +467,25 @@ export default {
{
id: 8,
title: "商学院资讯",
url: "/static/mine/tool_sxy.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_sxy.png",
path: "/pages/login_package/news/news",
},
{
id: 12,
title: "财务",
url: "/static/mine/tool_cw.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_cw.png",
path: "/pages/rwa_package/dongjian/finance",
},
{
id: 11,
title: "股东行权",
url: "/static/mine/tool_gdxq.png",
url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_gdxq.png",
path: "/pages/rwa_package/rwa/rwa",
},
// {
// id:1,
// title:"IM聊天",
// url:'/static/mine/tool_im.png'
// url:'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_im.png'
// },
], // 工具
brandShow: false, // 品牌入驻弹框
pages/mine_package/mild-shopping/mild-shopping.vue
+16 -12
View File
@@ -1,16 +1,18 @@
<template>
<view class="mild-shopping">
<web-view
ref="webview"
:webview-styles="webviewStyles"
:src="webviewUrl"
@message="handlePostMessage"
@onPostMessage="handlePostMessage"
></web-view></view>
<view class="mild-shopping">
<web-view
ref="webview"
:webview-styles="webviewStyles"
:src="webviewUrl"
@message="handlePostMessage"
@onPostMessage="handlePostMessage"
></web-view
></view>
</template>
<script>
import { TOKEN_NAME, USER_DATA, getStorageFun } from "@/utils/auth.js";
import { MILD_BASE_URL } from "@/utils/config.js";
// 全局变量
let wv; // 计划创建的webview
@@ -23,14 +25,16 @@ export default {
},
},
wvNode: null,
// webviewUrl:'https://agent.o.tbmall.xin/',//中台测试
webviewUrl:'https://agent.tbmall.xin',
webviewUrl: "",
// webviewUrl:'https://agent.o.tbmall.xin/',//中台测试
// webviewUrl:'https://agent.tbmall.xin',
// webviewUrl: "http://192.168.1.29:8004/",
};
},
onShow() {
// #ifdef APP-PLUS
this.webviewUrl = MILD_BASE_URL;
this.initWebview();
// #endif
},
@@ -43,7 +47,7 @@ export default {
const currentWebview = this.$scope.$getAppWebview();
setTimeout(() => {
wv = currentWebview.children()[0];
console.log(
console.log(
"TOKEN_NAME-1",
getStorageFun(TOKEN_NAME),
getStorageFun(USER_DATA)
@@ -112,7 +116,7 @@ export default {
</script>
<style lang="scss" scoped>
.mild-shopping{
.mild-shopping {
padding-top: var(--status-bar-height);
}
</style>
pages/mine_package/mine_authentication_ok/mine_authentication_ok.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<Header class="head-view-one" :leftTitle="$t('authentication.title')" left-path-type="switchTab" left-path="/pages/mine/mine" />
<view class="authentication_ok_content" v-if="currentUserData && Object.keys(currentUserData).length !== 0">
<view class="authentication_result">
<up-image src="/static/new/ren.png" mode="widthFix"
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/ren.png" mode="widthFix"
shape="circle" width="90" height="104" bgColor="#f1f6ff00" :fade="true" duration="450"></up-image>
<view class="result_value">{{ getValue(CERT_STATUS_OPTION, currentUserData.certStatus) }}</view>
</view>
pages/mine_package/mine_purse_bonus/mine_purse_bonus.vue
+1 -1
View File
@@ -16,7 +16,7 @@
<view class="content_list">
<view class="content_item purse_info_item" v-for="item in contentList" :key="item.id">
<view class="purse_info_left">
<up-image :src="item.type === 1 ? '/static/mine/purse_j.png' : '/static/mine/purse_t.png'" width="40"
<up-image :src="item.type === 1 ? 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/purse_j.png' : 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/purse_t.png'" width="40"
height="40" bgColor="#f1f6ff00"></up-image>
<view class="purse_data_warp">
<view class="purse_info_name">{{ item.name }}</view>
pages/mine_package/mine_purse_exchange/mine_purse_exchange.vue
+1 -1
View File
@@ -6,7 +6,7 @@
<view class="recharge_balance">
<view class="recharge_balance_image">
<view style="margin-top: 6rpx;">
<up-image src="/static/mine/exchange.png" width="20" height="20" bgColor="#f1f6ff00" />
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/exchange.png" width="20" height="20" bgColor="#f1f6ff00" />
</view>
<view class="msg_">可兑换余额</view>
</view>
pages/mine_package/mine_purse_log/mine_purse_log.vue
+2 -2
View File
@@ -38,8 +38,8 @@
<view v-for="item in orderList" :key="item.id" class="purse_info_item-mine"
v-if="orderList && orderList.length !== 0">
<view class="purse_info_left">
<!-- <up-image :src="item.type === 1? '/static/mine/purse_sf.png' : '/static/mine/purse_xf.png'" width="40" height="40" bgColor="#f1f6ff00"></up-image> -->
<up-image :src="item.amount > 0 ? '/static/mine/zhen.png' : '/static/mine/fu.png'" width="32" height="32" bgColor="#f1f6ff00"></up-image>
<!-- <up-image :src="item.type === 1? 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/purse_sf.png' : 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/purse_xf.png'" width="40" height="40" bgColor="#f1f6ff00"></up-image> -->
<up-image :src="item.amount > 0 ? 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/zhen.png' : 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/fu.png'" width="32" height="32" bgColor="#f1f6ff00"></up-image>
<view class="purse_data_warp">
<view class="purse_info_name">{{ getValue(BALANCE_TYPE, item.type) }}</view>
pages/mine_package/mine_purse_recharge/mine_purse_recharge.vue
+1 -1
View File
@@ -5,7 +5,7 @@
<view class="purse_recharge_cntent">
<view class="recharge_balance">
<view class="recharge_balance_image">
<up-image src="/static/mine/recharge.png" width="20" height="20" bgColor="#f1f6ff00" />
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/recharge.png" width="20" height="20" bgColor="#f1f6ff00" />
<view class="msg_">现金余额</view>
</view>
<view class="recharge_balance_">{{ proAmount }}</view>
pages/order_package/order_submit/order_submit.vue
+4 -4
View File
@@ -234,19 +234,19 @@
<view class="way-option-item">
<image
v-if="item.type == 'wechat'"
src="@/static/new/wx.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/wx.png"
></image>
<image
v-if="item.type == 'alipay'"
src="@/static/new/zfb.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/zfb.png"
></image>
<image
v-if="item.type == 'balance'"
src="@/static/new/bank.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/bank.png"
></image>
<image
v-if="item.type == 'redpacket'"
src="@/static/new/jf.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/jf.png"
></image>
<text
v-if="item.type == 'wechat' || item.type == 'alipay'"
pages/other_package/components/share-popup.vue
+245
View File
@@ -0,0 +1,245 @@
<template>
<up-popup
:show="show"
:round="24"
:closeOnClickOverlay="false"
>
<view class="share-popup-view">
<view class="share-head">
<text class="text-28 text-zu1">分享信任桥</text>
</view>
<view class="share-btn-view">
<view class="share-box" @click="onBtn(index)" v-for="(item,index) in btnList" :key="index">
<image :src="`https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/share_${index}.png`" class="share-img"></image>
<text class="text-24 text-zu1">{{item}}</text>
</view>
</view>
<view class="share-line" style="margin-top:40rpx;"></view>
<view class="qr-view" v-if="qrvalue">
<tki-qrcode ref="qrcode" :val="qrvalue" :size="252" />
</view>
<view class="share-line" style="min-height:16rpx;height:16rpx">
</view>
<view class="share-bottom" @click="onClose">
<text class="text-32 text-fu1">取消</text>
</view>
<view class="share-top-image-view">
<image :src="tu" class="tu-img"></image>
<view class="image-view-bottom">
<view class="image-view-bottom-left">
<text class="text-24 text-zu1 text-overflow1">{{text}}</text>
</view>
<view class="image-view-bottom-right">
<text class="text-24 text-zi">￥{{price}}</text>
</view>
</view>
</view>
</view>
</up-popup>
</template>
<script>
import Func from '/utils/func'
import tkiQrcode from './tki-qrcode/tki-qrcode.vue'
import {SHARE_URL} from '@/utils/config.js'
export default {
components:{tkiQrcode},
data() {
return {
btnList:['微信','朋友圈','复制链接','保存图片','QQ'],
qrvalue:''
}
},
props:{
show:{
type:Boolean,
default:false
},
id:{
type:String,
default:''
},
tu:{
type:String,
default:''
},
price:{
type:String,
default:''
},
text:{
type:String,
default:''
}
},
mounted(){
this.qrvalue = `${SHARE_URL}/#/pages/other_package/productInfo/productInfo?id=${this.id}`
this.$nextTick(()=>{
if(this.qrvalue){
this.creatQrcode();
}
})
},
methods: {
creatQrcode() {
this.$refs.qrcode._makeCode();
},
onBtn(index){
if(index == 2){
let tmp = `【信任桥】消费共享数字化权益　${this.qrvalue}　${this.text}`;
// #ifdef APP-PLUS
uni.setClipboardData({
data:tmp,
success:function(res){
uni.getClipboardData({
success:function(res){
Func.myToast('复制成功')
}
})
}
})
// #endif
// #ifdef H5
this.$copyText(tmp).then(res=>{
console.log('resresresres',res)
Func.myToast('复制成功')
})
// #endif
}
this.$emit('share',index)
},
onClose(){
this.$emit('close');
},
onOk(){
Func.debounce(this.dOk())
},
dOk(){
this.$emit('ok');
}
}
}
</script>
<style lang="scss" scoped>
.share-top-image-view{
width:400rpx;
min-height:496rpx;
height:496rpx;
display: flex;
flex-direction: column;
align-items: center;
padding: 32rpx;
box-sizing: border-box;
border-radius: 24rpx;
position: absolute;
background-color: #fff;
top:-638rpx;
.image-view-bottom{
width:100%;
flex:1;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin-top:20rpx;
.image-view-bottom-left{
height:72rpx;
min-height:72rpx;
border-right: 2rpx solid #EBEBEB;
display: flex;
align-items: center;
padding-right: 10rpx;
}
.image-view-bottom-right{
// min-width:130rpx;
margin-left:10rpx;
height:72rpx;
min-height:72rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-end;
}
}
.tu-img{
width:100%;
height:344rpx;
}
}
.share-popup-view{
width:100%;
height:796rpx;
min-height:796rpx;
display: flex;
flex-direction: column;
align-items: center;
background-color: #fff;
border-radius: 24rpx 24rpx 0 0;
position: relative;
.share-head{
width:100%;
height:88rpx;
display: flex;
align-items: center;
justify-content: center;
}
.share-bottom{
width:100%;
height:92rpx;
min-height:92rpx;
display: flex;
align-items: center;
justify-content: center;
}
.share-line{
display: flex;
width:100%;
height:2rpx;
min-height:2rpx;
background-color: #e7e7e7;
}
.qr-view{
width:100%;
height:332rpx;
min-height:332rpx;
display: flex;
align-items: center;
justify-content: center;
}
.share-btn-view{
width:100%;
height:124rpx;
min-height:124rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
// padding: 0 36rpx;
box-sizing: border-box;
margin-top:36rpx;
.share-box{
flex:1;
height:100%;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
.share-img{
width:80rpx;
height:80rpx;
}
}
}
}
</style>
pages/other_package/components/tki-qrcode/qrcode.js
+1201
View File
File diff suppressed because it is too large Load Diff
pages/other_package/components/tki-qrcode/tki-qrcode.vue
+211
View File
@@ -0,0 +1,211 @@
<template xlang="wxml" minapp="mpvue">
<view class="tki-qrcode">
<!-- #ifndef MP-ALIPAY -->
<canvas class="tki-qrcode-canvas" :canvas-id="cid" :style="{width:cpSize+'px',height:cpSize+'px'}" />
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<canvas :id="cid" :width="cpSize" :height="cpSize" class="tki-qrcode-canvas" />
<!-- #endif -->
<image v-show="show" :src="result" :style="{width:cpSize+'px',height:cpSize+'px'}" />
</view>
</template>
<script>
import QRCode from "./qrcode.js"
let qrcode
export default {
name: "tki-qrcode",
props: {
cid: {
type: String,
default: 'tki-qrcode-canvas'
},
size: {
type: Number,
default: 200
},
unit: {
type: String,
default: 'upx'
},
show: {
type: Boolean,
default: true
},
val: {
type: String,
default: ''
},
background: {
type: String,
default: '#ffffff'
},
foreground: {
type: String,
default: '#000000'
},
pdground: {
type: String,
default: '#000000'
},
icon: {
type: String,
default: ''
},
iconSize: {
type: Number,
default: 40
},
lv: {
type: Number,
default: 3
},
onval: {
type: Boolean,
default: false
},
loadMake: {
type: Boolean,
default: false
},
usingComponents: {
type: Boolean,
default: true
},
showLoading: {
type: Boolean,
default: true
},
loadingText: {
type: String,
default: '二维码生成中'
},
},
data() {
return {
result: '',
}
},
methods: {
_makeCode() {
let that = this
if (!this._empty(this.val)) {
qrcode = new QRCode({
context: that, // 上下文环境
canvasId:that.cid, // canvas-id
usingComponents: that.usingComponents, // 是否是自定义组件
showLoading: that.showLoading, // 是否显示loading
loadingText: that.loadingText, // loading文字
text: that.val, // 生成内容
size: that.cpSize, // 二维码大小
background: that.background, // 背景色
foreground: that.foreground, // 前景色
pdground: that.pdground, // 定位角点颜色
correctLevel: that.lv, // 容错级别
image: that.icon, // 二维码图标
imageSize: that.iconSize,// 二维码图标大小
cbResult: function (res) { // 生成二维码的回调
that._result(res)
},
});
} else {
uni.showToast({
title: '二维码内容不能为空',
icon: 'none',
duration: 2000
});
}
},
_clearCode() {
this._result('')
qrcode.clear()
},
_saveCode() {
let that = this;
if (this.result != "") {
uni.saveImageToPhotosAlbum({
filePath: that.result,
success: function () {
uni.showToast({
title: '二维码保存成功',
icon: 'success',
duration: 2000
});
}
});
}
},
_result(res) {
this.result = res;
this.$emit('result', res)
},
_empty(v) {
let tp = typeof v,
rt = false;
if (tp == "number" && String(v) == "") {
rt = true
} else if (tp == "undefined") {
rt = true
} else if (tp == "object") {
if (JSON.stringify(v) == "{}" || JSON.stringify(v) == "[]" || v == null) rt = true
} else if (tp == "string") {
if (v == "" || v == "undefined" || v == "null" || v == "{}" || v == "[]") rt = true
} else if (tp == "function") {
rt = false
}
return rt
}
},
watch: {
size: function (n, o) {
if (n != o && !this._empty(n)) {
this.cSize = n
if (!this._empty(this.val)) {
setTimeout(() => {
this._makeCode()
}, 100);
}
}
},
val: function (n, o) {
if (this.onval) {
if (n != o && !this._empty(n)) {
setTimeout(() => {
this._makeCode()
}, 0);
}
}
}
},
computed: {
cpSize() {
if(this.unit == "upx"){
return uni.upx2px(this.size)
}else{
return this.size
}
}
},
mounted: function () {
if (this.loadMake) {
if (!this._empty(this.val)) {
setTimeout(() => {
this._makeCode()
}, 0);
}
}
},
}
</script>
<style>
.tki-qrcode {
position: relative;
}
.tki-qrcode-canvas {
position: fixed;
top: -99999upx;
left: -99999upx;
z-index: -99999;
}
</style>
pages/other_package/productInfo/productInfo.vue
+3 -3
View File
@@ -450,7 +450,7 @@
import { getGoodsDetail, addGoods, getGoodsSpecs } from "@/api/product.js";
import { getValue, PRODUCT_DELIVERY_TIME } from "@/utils/enumUtils.js";
import { copyData } from "@/utils/index.js";
import SharePopup from "@/components/common/share-popup.vue"
import SharePopup from "@/pages/other_package/components/share-popup.vue"
import MyBtn from '@/components/common/my-btn.vue'
import { getPostageQuery } from "@/api/cart.js";
import { assembleAddress } from "@/utils/index.js";
@@ -647,7 +647,7 @@ export default {
}
})
last = await qsc.drawImg({
val: '../../../static/new/di.png',
val: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/di.png',
x: 0,
y: 0,
height: 480,
@@ -655,7 +655,7 @@ export default {
})
last = await qsc.drawImg({
val: '../../../static/new/logo.png',
val: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/logo.png',
x: 228,
y: 393,
height: 62,
pages/rwa_package/account/components/account-item-two.vue
+2 -2
View File
@@ -1,7 +1,7 @@
<template>
<view class="shop-item-view" v-if="dataItem">
<image src="/static/new/alpha.png" v-if="dataItem.name != 'WALLET'"></image>
<image src="/static/new/no_black_data.png" v-else></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/alpha.png" v-if="dataItem.name != 'WALLET'"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/no_black_data.png" v-else></image>
<view class="shop-mid-view-one" v-if="dataItem.name != 'WALLET'">
<text class="text-32 text-zu1 text-overflow">{{dataItem.account}}</text>
</view>
pages/rwa_package/account/components/account-item.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<view class="shop-item-view" >
<image :src="type == 2 ? '../../../static/new/zfb.png' : '../../../static/new/wx.png'" ></image>
<image :src="type == 2 ? 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/zfb.png' : 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/wx.png'" ></image>
<view class="show-item-left">
<text class="text-32 text-zu1">{{itemData.name}}</text>
<text class="text-26 text-fu1">账号：{{itemData.account}}</text>
pages/rwa_package/account/components/select-item.vue
+3 -3
View File
@@ -8,7 +8,7 @@
</view>
<view class="item-mid-view" v-if="data.length">
<view class="item-mid-list" v-for="(item,index) in data" :key="item.id">
<image :src="type == 1 ? '../../../static/new/zfb.png' : '../../../static/new/wx.png'" ></image>
<image :src="type == 1 ? 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/zfb.png' : 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/wx.png'" ></image>
<view class="show-item-left">
<text class="text-32 text-zu1">{{item.name}}</text>
<text class="text-26 text-fu1">账号：{{item.account}}</text>
@@ -19,10 +19,10 @@
</view>
</view>
<view class="item-mid-view-two" @click="onAdd" v-if="!data.length">
<image src="/static/new/no_black_data.png" class="no-data-black"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/no_black_data.png" class="no-data-black"></image>
<text class="text-28 text-fu mt-48">{{`请先绑定一个${type == 0 ? '微信' : '支付宝'}账户，用于收款`}}</text>
<view class="add-btn mt-48">
<image src="/static/new/add.png" style="margin-right:5rpx;"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/add.png" style="margin-right:5rpx;"></image>
<text class="text-32 text-zi text-bold" style="margin-left:5rpx;">添加</text>
</view>
</view>
pages/rwa_package/account/components/select-lian-two.vue
+3 -3
View File
@@ -8,17 +8,17 @@
</view>
<view class="item-mid-view" v-if="data.length">
<view class="item-mid-list" @click="onOk(item)" v-for="(item,index) in data" :key="item.id">
<image src="/static/new/alpha.png" style="min-width:88rpx;heihgt:88rpx;"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/alpha.png" style="min-width:88rpx;heihgt:88rpx;"></image>
<view class="item-mid-li">
<text class="text-28 text-fu">{{item.account}}</text>
</view>
</view>
</view>
<view class="item-mid-view-two" @click="onAdd" v-if="!data.length">
<image src="/static/new/no_black_data.png" class="no-data-black"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/no_black_data.png" class="no-data-black"></image>
<text class="text-28 text-fu mt-48">{{`请先绑定一个ALPHACEX账户，用于收款`}}</text>
<view class="add-btn mt-48">
<image src="/static/new/add.png" style="margin-right:5rpx;"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/add.png" style="margin-right:5rpx;"></image>
<text class="text-32 text-zi text-bold" style="margin-left:5rpx;">添加</text>
</view>
</view>
pages/rwa_package/account/components/select-lian.vue
+3 -3
View File
@@ -8,7 +8,7 @@
</view>
<view class="item-mid-view" v-if="data.length">
<view class="item-mid-list" @click="onOk(item)" v-for="(item,index) in data" :key="item.id">
<image src="/static/new/no_black_data.png" style="min-width:88rpx;heihgt:88rpx;"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/no_black_data.png" style="min-width:88rpx;heihgt:88rpx;"></image>
<view class="item-mid-li">
<text class="text-32 text-zu1">BNB Smart Chain（BEP20）</text>
<text class="text-28 text-fu">{{item.addressOne}}</text>
@@ -16,10 +16,10 @@
</view>
</view>
<view class="item-mid-view-two" @click="onAdd" v-if="!data.length">
<image src="/static/new/no_black_data.png" class="no-data-black"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/no_black_data.png" class="no-data-black"></image>
<text class="text-28 text-fu mt-48">{{`请先绑定一个区块链账户，用于收款`}}</text>
<view class="add-btn mt-48">
<image src="/static/new/add.png" style="margin-right:5rpx;"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/add.png" style="margin-right:5rpx;"></image>
<text class="text-32 text-zi text-bold" style="margin-left:5rpx;">添加</text>
</view>
</view>
pages/rwa_package/account/components/shu-tips.vue
+2 -2
View File
@@ -7,7 +7,7 @@
<u-icon name="close" color="#333" size="16" @click="onClose"></u-icon>
</view>
<view class="select-box" @click="onOk(0)">
<image src="@/static/new/shu_0.png"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/shu_0.png"></image>
<view class="select-box-one">
<text class="text-32 text-zu1">区块链数字积分</text>
<text class="text-26 text-fu1">通过区块链兑换</text>
@@ -15,7 +15,7 @@
<u-icon name="arrow-right" color="#999" size="14" class="select-icon"></u-icon>
</view>
<!-- <view class="select-box" @click="onOk(1)">
<image src="@/static/new/shu_1.png"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/shu_1.png"></image>
<view class="select-box-one">
<text class="text-32 text-zu1">alpha数字积分</text>
<text class="text-26 text-fu1">通过邮箱兑换</text>
pages/rwa_package/account/shu.vue
+3 -3
View File
@@ -13,7 +13,7 @@
placeholder="请输入或选择地址"
placeholder-style="color:#999;font-weight:400;"
border="0" v-model="inputOne" :customStyle="inputCss"></input>
<image src="@/static/new/right_icon.png" class="right-img" @click="onSelectAddress"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/right_icon.png" class="right-img" @click="onSelectAddress"></image>
</view>
<text class="text-32 text-fu" style="margin:54rpx 0 32rpx">主网络</text>
@@ -44,12 +44,12 @@
@input="onInputTwo"
border="0" v-model="inputFour" :customStyle="inputCss"></input>
<image @click="onIsSys" :src="`/static/new/eye_${isEve}.png`" class="right-img"></image>
<image @click="onIsSys" :src="`https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/eye_${isEve}.png`" class="right-img"></image>
</view>
</view>
<view class="bottom-btn">
<view class="bottom-top">
<image src="/static/new/icon.png"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/icon.png"></image>
<text class="text-24 text-zi">为了保障用户体验感，额外赠送0.0001主网gas</text>
</view>
<view class="bottom-view">
pages/rwa_package/account/withdraw.vue
+2 -2
View File
@@ -21,7 +21,7 @@
<text class="text-zu1 text-32">{{type == 0 ? '提现' : '充值'}}方式</text>
<view class="item-view" @click="onSelect('0')" v-if="!isWeb || type != 0">
<image src="../../../static/new/wx.png"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/wx.png"></image>
<text class="text-zu1 text-32 " style="margin-left:20rpx;">微信</text>
<view class="right-icon-view" v-if="type == 1">
<u-radio-group v-model="curSelect">
@@ -34,7 +34,7 @@
</view>
</view>
<view class="item-view" @click="onSelect('1')" style="border-width: 0;" >
<image src="../../../static/new/zfb.png"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/zfb.png"></image>
<text class="text-zu1 text-32 " style="margin-left:20rpx;">支付宝</text>
<view class="right-icon-view" v-if="type == 1">
<u-radio-group v-model="curSelect">
pages/rwa_package/dongjian/check.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<Header title="查看合同" />
<view class="contract-view">
<view class="top-info flex-r-lr">
<image src="@/static/new/he.png"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/he.png"></image>
<view class="right-view">
<text class="text-36 text-zu">{{ obj.contractName }}</text>
<view class="bottom-panel">
pages/rwa_package/rwa_withdrawal/rwa_withdrawal.vue
+3 -3
View File
@@ -14,7 +14,7 @@
placeholder-style="color:#999;font-weight:400;"
disabled
border="0" v-model="inputOne" :customStyle="inputCss"></input>
<image src="@/static/new/right_icon.png" class="right-img" @click="onSelectAddress"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/right_icon.png" class="right-img" @click="onSelectAddress"></image>
</view>
<text class="text-32 text-fu" style="margin:54rpx 0 32rpx">行权金额
@@ -39,7 +39,7 @@
@input="onInputTwo"
border="0" v-model="inputFour" :customStyle="inputCss"></input>
<image @click="onIsSys" :src="`/static/new/eye_${isEve}.png`" class="right-img"></image>
<image @click="onIsSys" :src="`https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/eye_${isEve}.png`" class="right-img"></image>
</view>
<text class="text-32 text-fu" style="marign-top:32rpx;margin-bottom:32rpx">备注：</text>
@@ -52,7 +52,7 @@
</view>
<view class="bottom-btn">
<!-- <view class="bottom-top">
<image src="/static/new/icon.png"></image>
<image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/icon.png"></image>
<text class="text-24 text-zi">为了保障用户体验感，额外赠送0.0001主网gas</text>
</view> -->
<view class="bottom-view">
pages/rwa_package/setting/zhao.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<TopSafe></TopSafe>
<Header :title="zhaoList[type]" />
<view class="setting-view">
<image :src="`/static/new/zi_${type + 1}.png`" mode="widthFix" ></image>
<image :src="`https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/new/zi_${type + 1}.png`" mode="widthFix" ></image>
</view>
<up-toast ref="uToastRef"></up-toast>
</view>
pages/rwa_package/shop/you-shop.vue
+4 -4
View File
@@ -10,7 +10,7 @@
style="height: 80rpx; display: flex; align-items: center"
>
<image
src="/static/home/shop-title.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/shop-title.png"
style="width: 240rpx; height: 38rpx"
></image>
</view>
@@ -23,7 +23,7 @@
>
<view style="margin-top: 10rpx">
<up-image
src="/static/home/shop-search.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/shop-search.png"
width="20"
height="20"
bgColor="#f1f6ff00"
@@ -47,13 +47,13 @@
</view>
<view class="swiper-title">
<image
src="/static/home/shop-intro.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/shop-intro.png"
style="width: 308rpx; height: 30rpx"
></image>
<view class="swiper-center text-zi">信任桥-畅享全球好物</view>
<image
@click="goShare"
src="/static/home/shop-go.png"
src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/home/shop-go.png"
style="width: 75rpx; height: 30rpx"
></image>
</view>
pages/shopping_cart/shopping_cart.vue
+1 -1
View File
@@ -193,7 +193,7 @@
<up-toast ref="uToastRef"></up-toast>
</view>
<!-- #ifndef H5 -->
<!-- #ifndef H5 || MP-WEIXIN-->
<CustomTabBar :tabIndex="3" />
<!-- #endif -->
</view>
pages/sort/sort.vue
+1 -1
View File
@@ -100,7 +100,7 @@
</view>
</scroll-view>
</view>
<!-- #ifndef H5 -->
<!-- #ifndef H5 || MP-WEIXIN-->
<CustomTabBar :tabIndex="1" />
<!-- #endif -->
</view>
pages/supply_chain/supply_chain.vue
+1 -1
View File
@@ -69,7 +69,7 @@
</mescroll-uni>
</view>
</view>
<!-- #ifndef H5 -->
<!-- #ifndef H5 || MP-WEIXIN-->
<CustomTabBar :tabIndex="2" />
<!-- #endif -->
<up-toast ref="uToastRef"></up-toast>