diff --git a/App.vue b/App.vue
index 582b38ce..813b8cc5 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
data: {
// 基础配置
// 数据接口请求地址
- request_url:'https://d1.shopxo.vip/',
+ request_url:'http://shopxo.com/',
// 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/)
- static_url:'https://d1.shopxo.vip/',
+ static_url:'http://shopxo.com/',
// 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立)
system_type: 'default',
@@ -1797,12 +1797,12 @@
},
// 图片预览
- image_show_event(e) {
+ image_show_event(e, urls = null) {
var value = e.currentTarget.dataset.value || null;
if (value != null) {
uni.previewImage({
current: value,
- urls: [value],
+ urls: urls || [value],
});
} else {
this.showToast(i18n.t('shopxo-uniapp.app.qm8548'));
diff --git a/locale/en.json b/locale/en.json
index 5e4f977c..d80714bc 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -20,6 +20,9 @@
"edit": "Edit",
"link": "Link",
"gift": "Gift",
+ "image": "Image",
+ "video": "Video",
+ "file": "File",
"more": "More",
"more_null": "",
"view_more": "View more",
@@ -67,7 +70,8 @@
"apply_time": "Application time",
"verification_text": "Verification code",
"verification_message": "Please enter the verification code",
- "not_supported_scan_tips": "H5 webpage does not support scanning codes"
+ "not_supported_scan_tips": "H5 webpage does not support scanning codes",
+ "copy_link": "Copy link"
},
"pages": {
"goods-category": "Product classification",
@@ -233,7 +237,12 @@
"plugins-coin-recharge-list": "Recharge details",
"plugins-antifakecode-index": "Authentic inquiry",
"plugins-giftcard-index": "My gift card",
- "plugins-giftcard-form": "Gift card redemption"
+ "plugins-giftcard-form": "Gift card redemption",
+ "plugins-givegift-goods": "Buying Gifts",
+ "plugins-givegift-receive": "Gift collection",
+ "plugins-givegift-gift": "My gift",
+ "plugins-givegift-code": "Gift Link",
+ "plugins-orderresources-orderannex": "Order Resources"
},
"login": {
"login": {
@@ -729,7 +738,6 @@
"4h814w": "Pack up more",
"lfwj0g": "Expand more",
"2e5rv3": "Uploading, please wait a moment",
- "3h58hv": "picture",
"v19gg8": "Please enter a title",
"gu3x97": "Please select a category",
"adiq70": "Please enter the content"
@@ -1463,6 +1471,7 @@
"lp1v28": "Urge and urge",
"ht65c9": "Suborder",
"9l47b6": "form",
+ "fyuikn": "resources",
"3l2jr5": "buy-back",
"7571p2": "Merge payments",
"hp123x": "To be picked up",
diff --git a/locale/zh.json b/locale/zh.json
index a9a99952..4a580848 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -20,6 +20,9 @@
"edit": "编辑",
"link": "链接",
"gift": "礼物",
+ "image": "图片",
+ "video": "视频",
+ "file": "文件",
"more": "更多",
"more_null": "更 多",
"view_more": "查看更多",
@@ -67,7 +70,8 @@
"apply_time": "申请时间",
"verification_text": "核销码",
"verification_message": "请输入核销码",
- "not_supported_scan_tips": "H5网页不支持扫码"
+ "not_supported_scan_tips": "H5网页不支持扫码",
+ "copy_link": "复制链接"
},
"pages": {
"goods-category": "商品分类",
@@ -235,7 +239,8 @@
"plugins-givegift-goods": "购买礼品",
"plugins-givegift-receive": "礼品领取",
"plugins-givegift-gift": "我的送礼",
- "plugins-givegift-code": "礼品链接"
+ "plugins-givegift-code": "礼品链接",
+ "plugins-orderresources-orderannex": "订单资源"
},
"login": {
"login": {
@@ -723,7 +728,6 @@
"4h814w": "收起更多",
"lfwj0g": "展开更多",
"2e5rv3": "上传中请稍后",
- "3h58hv": "图片",
"v19gg8": "请输入标题",
"gu3x97": "请选择分类",
"adiq70": "请输入内容"
@@ -1455,6 +1459,7 @@
"lp1v28": "催催",
"ht65c9": "子单",
"9l47b6": "表单",
+ "fyuikn": "资源",
"3l2jr5": "回购",
"7571p2": "合并支付",
"hp123x": "待取货",
diff --git a/pages.json b/pages.json
index 4fe20027..19414868 100644
--- a/pages.json
+++ b/pages.json
@@ -1653,6 +1653,18 @@
}
}
]
+ },
+ {
+ "root": "pages/plugins/orderresources",
+ "pages": [
+ {
+ "path": "orderannex/orderannex",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
+ }
+ ]
}
],
"preloadRule": {
diff --git a/pages/plugins/blog/form/form.vue b/pages/plugins/blog/form/form.vue
index 3d6992a7..8a9b766f 100644
--- a/pages/plugins/blog/form/form.vue
+++ b/pages/plugins/blog/form/form.vue
@@ -362,7 +362,7 @@
editorCtx.insertImage({
src: data.data.url, // 此处需要将图片地址切换成服务器返回的真实图片地址
// width: '50%',
- alt: self.$t('form.form.3h58hv'),
+ alt: self.$t('common.video'),
success: function (e) {},
});
uni.hideLoading();
diff --git a/pages/plugins/givegift/code/code.vue b/pages/plugins/givegift/code/code.vue
index a493d0f6..482adda5 100644
--- a/pages/plugins/givegift/code/code.vue
+++ b/pages/plugins/givegift/code/code.vue
@@ -27,7 +27,7 @@
-
+
@@ -51,7 +51,8 @@
data_total: 0,
data_page_total: 0,
data_page: 1,
- data_list_loding_status: 1,
+ data_list_loding_status: 1,
+ data_list_loding_msg: '',
data_bottom_line_status: false,
data_is_loading: 0,
params: null,
@@ -144,7 +145,7 @@
data_list_loding_status: 2,
data_list_loding_msg: res.data.msg,
});
- if (app.globalData.is_login_check(res.data, this, 'get_data_base')) {
+ if (app.globalData.is_login_check(res.data, this, 'get_data')) {
app.globalData.showToast(res.data.msg);
}
}
@@ -154,7 +155,6 @@
this.setData({
data_bottom_line_status: false,
data_list_loding_status: 2,
- data_list_loding_msg: this.$t('common.internet_error_tips'),
});
app.globalData.showToast(this.$t('common.internet_error_tips'));
},
diff --git a/pages/plugins/orderresources/orderannex/orderannex.css b/pages/plugins/orderresources/orderannex/orderannex.css
new file mode 100644
index 00000000..3bcc6eb3
--- /dev/null
+++ b/pages/plugins/orderresources/orderannex/orderannex.css
@@ -0,0 +1,18 @@
+.images-data-list .item {
+ gap: 40rpx 20rpx;
+}
+.images-data-list .item-content {
+ width: calc(25% - 21rpx);
+ height: 200rpx;
+}
+.images-data-list .item .image,
+.video-data-list .item .video {
+ height: calc(100% - 40rpx);
+}
+.video-data-list .item {
+ gap: 50rpx 20rpx;
+}
+.video-data-list .item-content {
+ width: 100%;
+ height: 440rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/orderresources/orderannex/orderannex.vue b/pages/plugins/orderresources/orderannex/orderannex.vue
new file mode 100644
index 00000000..9a19e3be
--- /dev/null
+++ b/pages/plugins/orderresources/orderannex/orderannex.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+ {{$t('common.image')}}
+
+
+
+ {{$t('common.copy_link')}}
+
+
+
+
+
+
+ {{$t('common.video')}}
+
+
+
+ {{$t('common.copy_link')}}
+
+
+
+
+
+
+ {{$t('common.file')}}
+
+
+ {{item.title}}
+ {{$t('common.copy_link')}}
+
+
+
+
+
+
+ {{$t('common.note')}}
+ {{data.note}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index 0d4b993d..cb8c2e09 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -46,7 +46,7 @@
-
+
{{$t('user-order-detail.user-order-detail.423rmr')}}{{ item.buy_number_count }}{{$t('user-order-detail.user-order-detail.41ty94')}}{{ item.currency_data.currency_symbol }}{{ item.total_price }}
0 ) ||
(item.status == 2 && item.order_model != 2) ||
((item.plugins_express_data || 0) == 1 && (item.express_data || null) != null) ||
@@ -80,6 +81,7 @@
+