TmOct5/dtx_store
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

处理merge

Browse Source
This commit is contained in:
张冬雪
2022-08-30 08:38:06 +08:00
parent 695587c1a2 d401416db2
commit 5d72deb94f
14 changed files with 282 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
/unpackage
/node_modules
/.hbuilderx
/unpackage/dist

5
apis/index.js
View File

@@ -9,8 +9,8 @@ import router from '../router'
// 基础配置
const config = {
// apiUrl : 'https://api.gongli.vip/api/', // 正式环境
apiUrl: 'http://api.gl.shangkelian.cn/api/', // 测试
apiUrl : 'https://api.gongli.vip/api/', // 正式环境
// apiUrl: 'http://api.gl.shangkelian.cn/api/', // 测试
timeout: 60000
}
@@ -46,7 +46,6 @@ const request = (parameter, hideLoding = true) => {
data: parameter.data || {},
method: parameter.method || 'GET',
success: res => {
console.log(res);
if (res.header.Authorization) {
updateToken('token', res.header.Authorization)
}

6
manifest.json
View File

@@ -2,7 +2,7 @@
"name" : "共力生态",
"appid" : "__UNI__DE7B0E6",
"description" : "共力生态",
"versionName" : "1.0.42",
"versionName" : "1.0.44",
"versionCode" : 100,
"transformPx" : false,
/* 5+App特有相关 */
@@ -211,5 +211,7 @@
"uniStatistics" : {
"enable" : true
}
}
},
"fallbackLocale" : "zh-Hans",
"locale" : "auto"
}

BIN
pages/.DS_Store vendored
View File

Binary file not shown.

8
pages/store/goods.vue
View File

@@ -388,10 +388,10 @@
}
this.specselect = newlist
},
toVip() {
uni.navigateTo({
url: '/pages/store/vip/index/index?id=' + this.goods.shop.shop_id,
})
toVip(){
uni.navigateTo({
url: '/pages/store/vip/index/index?id=' + this.goods.shop.shop_id + '&identityId=' + this.goods.shop_vip.card.identity_id,
})
},
// 会员商品领取
vipBuy() {

15
pages/store/vip/index/index.vue
View File

@@ -1,8 +1,8 @@
<template>
<view class="store-vip">
<image class="vip-bg" src="/static/store/store-vip-bg.png" mode="widthFix"/>
<swiper class="swiper" circular>
<swiper-item class="swiper-item" v-for="item in vip" :key="item.identity_id">
<swiper class="swiper" circular :current="swiperCurrent">
<swiper-item class="swiper-item" v-for="(item, index) in vip" :key="index">
<view class="top">
<view class="left" v-if="vip.length > 1">
<image class="left-img" src="/static/store/get-more.gif" mode="widthFix" /> 滑动获取更多
@@ -14,7 +14,7 @@
<image class="title2" :src="item.title_cover" mode="widthFix" />
<view class="title3"> {{item.description}} </view> <!-- 分类 -->
<view class="type">
<view class="type-item" v-for="it in item.rules" :key="it.order">
<view class="type-item" v-for="(it, itIndex) in item.rules" :key="itIndex">
<image :src="it.cover" mode="aspectFill" />
<view class="title">{{it.name}}</view>
</view>
@@ -46,11 +46,15 @@
export default {
data() {
return {
vip: [],
id : '',
identityId : '',
vip : [],
swiperCurrent : 0
};
},
onLoad(e) {
this.id = e.id;
this.identityId = e.identityId
this.getInfo()
},
methods: {
@@ -59,7 +63,8 @@
uni.setNavigationBarTitle({
title: res[0].shop.name + '会员'
});
this.vip = res;
this.vip = res;
this.swiperCurrent = res.findIndex(val => val.identity_id == this.identityId)
}).catch(err => {
uni.showToast({
title: err.message,

4
pages/user/index.vue
View File

@@ -114,10 +114,10 @@
</block>
</view>
<view class="btns-box">
<view class="btns-box-item" @click="onBtn('PinList', {})">
<!-- <view class="btns-box-item" @click="onBtn('PinList', {})">
<image class="icon" src="@/static/user/userIcon_15.png" mode="widthFix" />
我的拼单 <uni-icons class="forward" type="forward" color="#999" />
</view>
</view> -->
<view class="btns-box-item" @click="onBtn('MyCard', {})">
<image class="icon" src="@/static/user/userIcon_00.png" mode="widthFix" />
我的卡券 <uni-icons class="forward" type="forward" color="#999" />

12
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

4
unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/manifest.json vendored
View File

File diff suppressed because one or more lines are too long

260
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

251
unpackage/dist/dev/app-plus/app-view.js vendored
View File

@@ -4585,12 +4585,12 @@ var render = function() {
_c("v-uni-image", {
staticClass: _vm._$g(69, "sc"),
attrs: {
src: "/static/user/userIcon_15.png",
src: "/static/user/userIcon_00.png",
mode: "widthFix",
_i: 69
}
}),
_vm._v("我的拼单"),
_vm._v("我的卡券"),
_c("uni-icons", {
staticClass: _vm._$g(70, "sc"),
attrs: { _i: 70 }
@@ -4613,12 +4613,12 @@ var render = function() {
_c("v-uni-image", {
staticClass: _vm._$g(72, "sc"),
attrs: {
src: "/static/user/userIcon_00.png",
src: "/static/user/userIcon_03.png",
mode: "widthFix",
_i: 72
}
}),
_vm._v("我的卡券"),
_vm._v("地址管理"),
_c("uni-icons", {
staticClass: _vm._$g(73, "sc"),
attrs: { _i: 73 }
@@ -4641,12 +4641,12 @@ var render = function() {
_c("v-uni-image", {
staticClass: _vm._$g(75, "sc"),
attrs: {
src: "/static/user/userIcon_03.png",
src: "/static/user/userIcon_07.png",
mode: "widthFix",
_i: 75
}
}),
_vm._v("地址管理"),
_vm._v("分享邀请"),
_c("uni-icons", {
staticClass: _vm._$g(76, "sc"),
attrs: { _i: 76 }
@@ -4669,59 +4669,31 @@ var render = function() {
_c("v-uni-image", {
staticClass: _vm._$g(78, "sc"),
attrs: {
src: "/static/user/userIcon_07.png",
src: "/static/user/userIcon_09.png",
mode: "widthFix",
_i: 78
}
}),
_vm._v("分享邀请"),
_vm._v("供应商入驻"),
_c("uni-icons", {
staticClass: _vm._$g(79, "sc"),
attrs: { _i: 79 }
})
],
1
),
_c(
"uni-view",
{
staticClass: _vm._$g(80, "sc"),
attrs: { _i: 80 },
on: {
click: function($event) {
return _vm.$handleViewEvent($event)
}
}
},
[
_c("v-uni-image", {
staticClass: _vm._$g(81, "sc"),
attrs: {
src: "/static/user/userIcon_09.png",
mode: "widthFix",
_i: 81
}
}),
_vm._v("供应商入驻"),
_c("uni-icons", {
staticClass: _vm._$g(82, "sc"),
attrs: { _i: 82 }
})
],
1
)
],
1
),
_c(
"uni-view",
{ staticClass: _vm._$g(83, "sc"), attrs: { _i: 83 } },
{ staticClass: _vm._$g(80, "sc"), attrs: { _i: 80 } },
[
_c(
"uni-view",
{
staticClass: _vm._$g(84, "sc"),
attrs: { _i: 84 },
staticClass: _vm._$g(81, "sc"),
attrs: { _i: 81 },
on: {
click: function($event) {
return _vm.$handleViewEvent($event)
@@ -4730,30 +4702,30 @@ var render = function() {
},
[
_c("v-uni-image", {
staticClass: _vm._$g(85, "sc"),
staticClass: _vm._$g(82, "sc"),
attrs: {
src: "/static/user/userIcon_14.png",
mode: "widthFix",
_i: 85
_i: 82
}
}),
_vm._v("绑定分享关系"),
_vm._$g(86, "i")
_vm._$g(83, "i")
? [
_c("uni-icons", {
staticClass: _vm._$g(87, "sc"),
attrs: { _i: 87 }
staticClass: _vm._$g(84, "sc"),
attrs: { _i: 84 }
})
]
: [
_c(
"v-uni-text",
{
staticClass: _vm._$g(89, "sc"),
staticClass: _vm._$g(86, "sc"),
staticStyle: { color: "gray" },
attrs: { _i: 89 }
attrs: { _i: 86 }
},
[_vm._v(_vm._$g(89, "t0-0"))]
[_vm._v(_vm._$g(86, "t0-0"))]
)
]
],
@@ -4764,8 +4736,36 @@ var render = function() {
),
_c(
"uni-view",
{ staticClass: _vm._$g(90, "sc"), attrs: { _i: 90 } },
{ staticClass: _vm._$g(87, "sc"), attrs: { _i: 87 } },
[
_c(
"uni-view",
{
staticClass: _vm._$g(88, "sc"),
attrs: { _i: 88 },
on: {
click: function($event) {
return _vm.$handleViewEvent($event)
}
}
},
[
_c("v-uni-image", {
staticClass: _vm._$g(89, "sc"),
attrs: {
src: "/static/user/userIcon_06.png",
mode: "widthFix",
_i: 89
}
}),
_vm._v("意见反馈"),
_c("uni-icons", {
staticClass: _vm._$g(90, "sc"),
attrs: { _i: 90 }
})
],
1
),
_c(
"uni-view",
{
@@ -4781,12 +4781,12 @@ var render = function() {
_c("v-uni-image", {
staticClass: _vm._$g(92, "sc"),
attrs: {
src: "/static/user/userIcon_06.png",
src: "/static/user/userIcon_08.png",
mode: "widthFix",
_i: 92
}
}),
_vm._v("意见反馈"),
_vm._v("版本更新"),
_c("uni-icons", {
staticClass: _vm._$g(93, "sc"),
attrs: { _i: 93 }
@@ -4809,12 +4809,12 @@ var render = function() {
_c("v-uni-image", {
staticClass: _vm._$g(95, "sc"),
attrs: {
src: "/static/user/userIcon_08.png",
src: "/static/user/userIcon_02.png",
mode: "widthFix",
_i: 95
}
}),
_vm._v("版本更新"),
_vm._v("免责声明"),
_c("uni-icons", {
staticClass: _vm._$g(96, "sc"),
attrs: { _i: 96 }
@@ -4822,40 +4822,12 @@ var render = function() {
],
1
),
_c(
"uni-view",
{
staticClass: _vm._$g(97, "sc"),
attrs: { _i: 97 },
on: {
click: function($event) {
return _vm.$handleViewEvent($event)
}
}
},
[
_c("v-uni-image", {
staticClass: _vm._$g(98, "sc"),
attrs: {
src: "/static/user/userIcon_02.png",
mode: "widthFix",
_i: 98
}
}),
_vm._v("免责声明"),
_c("uni-icons", {
staticClass: _vm._$g(99, "sc"),
attrs: { _i: 99 }
})
],
1
),
_vm._$g(100, "i")
_vm._$g(97, "i")
? _c(
"uni-view",
{
staticClass: _vm._$g(100, "sc"),
attrs: { _i: 100 },
staticClass: _vm._$g(97, "sc"),
attrs: { _i: 97 },
on: {
click: function($event) {
return _vm.$handleViewEvent($event)
@@ -4864,17 +4836,17 @@ var render = function() {
},
[
_c("v-uni-image", {
staticClass: _vm._$g(101, "sc"),
staticClass: _vm._$g(98, "sc"),
attrs: {
src: "/static/user/userIcon_05.png",
mode: "widthFix",
_i: 101
_i: 98
}
}),
_vm._v("退出登录"),
_c("uni-icons", {
staticClass: _vm._$g(102, "sc"),
attrs: { _i: 102 }
staticClass: _vm._$g(99, "sc"),
attrs: { _i: 99 }
})
],
1
@@ -4885,10 +4857,10 @@ var render = function() {
),
_c(
"uni-view",
{ staticClass: _vm._$g(103, "sc"), attrs: { _i: 103 } },
{ staticClass: _vm._$g(100, "sc"), attrs: { _i: 100 } },
[
_c("uni-view", { attrs: { _i: 104 } }, [_vm._v("共力生态")]),
_c("uni-view", { attrs: { _i: 105 } }, [
_c("uni-view", { attrs: { _i: 101 } }, [_vm._v("共力生态")]),
_c("uni-view", { attrs: { _i: 102 } }, [
_vm._v("The total force ecological")
])
],
@@ -4897,7 +4869,7 @@ var render = function() {
_c(
"u-modal",
{
attrs: { _i: 106 },
attrs: { _i: 103 },
on: {
confirm: function($event) {
return _vm.$handleViewEvent($event)
@@ -4910,16 +4882,16 @@ var render = function() {
[
_c(
"uni-view",
{ staticClass: _vm._$g(108, "sc"), attrs: { _i: 108 } },
{ staticClass: _vm._$g(105, "sc"), attrs: { _i: 105 } },
[
_c(
"uni-view",
{ staticClass: _vm._$g(109, "sc"), attrs: { _i: 109 } },
{ staticClass: _vm._$g(106, "sc"), attrs: { _i: 106 } },
[_vm._v("导出助记词")]
),
_c(
"uni-view",
{ staticClass: _vm._$g(110, "sc"), attrs: { _i: 110 } },
{ staticClass: _vm._$g(107, "sc"), attrs: { _i: 107 } },
[
_vm._v(
"请务必抄下助记词并存在安全的地方，若助记词丢失，重装或换设备登录时将无法查看历史消息！若助记词被他人获取，将可能获取你的信息！"
@@ -4928,15 +4900,15 @@ var render = function() {
),
_c(
"uni-view",
{ staticClass: _vm._$g(111, "sc"), attrs: { _i: 111 } },
[_vm._v(_vm._$g(111, "t0-0"))]
{ staticClass: _vm._$g(108, "sc"), attrs: { _i: 108 } },
[_vm._v(_vm._$g(108, "t0-0"))]
),
_c("v-uni-image", {
staticClass: _vm._$g(112, "sc"),
staticClass: _vm._$g(109, "sc"),
attrs: {
src: "/static/icon/userCloes.png",
mode: "widthFix",
_i: 112
_i: 109
},
on: {
click: function($event) {
@@ -4948,7 +4920,7 @@ var render = function() {
1
)
],
{ _i: 107 }
{ _i: 104 }
)
],
2
@@ -4956,7 +4928,7 @@ var render = function() {
_c(
"u-modal",
{
attrs: { _i: 113 },
attrs: { _i: 110 },
on: {
confirm: function($event) {
return _vm.$handleViewEvent($event)
@@ -4969,16 +4941,16 @@ var render = function() {
[
_c(
"uni-view",
{ staticClass: _vm._$g(115, "sc"), attrs: { _i: 115 } },
{ staticClass: _vm._$g(112, "sc"), attrs: { _i: 112 } },
[
_c(
"uni-view",
{ staticClass: _vm._$g(116, "sc"), attrs: { _i: 116 } },
{ staticClass: _vm._$g(113, "sc"), attrs: { _i: 113 } },
[_vm._v("文版通账号")]
),
_c(
"uni-view",
{ staticClass: _vm._$g(117, "sc"), attrs: { _i: 117 } },
{ staticClass: _vm._$g(114, "sc"), attrs: { _i: 114 } },
[
_vm._v(
"请务必抄下文版通账号并存在安全的地方，若文版通账号丢失，重装或换设备登录时将无法查看历史消息！若文版通账号被他人获取，将可能获取你的信息！"
@@ -4987,15 +4959,15 @@ var render = function() {
),
_c(
"uni-view",
{ staticClass: _vm._$g(118, "sc"), attrs: { _i: 118 } },
[_vm._v("账号：" + _vm._$g(118, "t0-0"))]
{ staticClass: _vm._$g(115, "sc"), attrs: { _i: 115 } },
[_vm._v("账号：" + _vm._$g(115, "t0-0"))]
),
_c("v-uni-image", {
staticClass: _vm._$g(119, "sc"),
staticClass: _vm._$g(116, "sc"),
attrs: {
src: "/static/icon/userCloes.png",
mode: "widthFix",
_i: 119
_i: 116
},
on: {
click: function($event) {
@@ -5007,7 +4979,7 @@ var render = function() {
1
)
],
{ _i: 114 }
{ _i: 111 }
)
],
2
@@ -5015,7 +4987,7 @@ var render = function() {
_c(
"u-modal",
{
attrs: { _i: 120 },
attrs: { _i: 117 },
on: {
confirm: function($event) {
return _vm.$handleViewEvent($event)
@@ -5031,22 +5003,22 @@ var render = function() {
[
_c(
"uni-view",
{ staticClass: _vm._$g(122, "sc"), attrs: { _i: 122 } },
{ staticClass: _vm._$g(119, "sc"), attrs: { _i: 119 } },
[
_c("v-uni-input", {
staticClass: _vm._$g(123, "sc"),
staticClass: _vm._$g(120, "sc"),
attrs: {
focus: true,
type: "number",
password: true,
maxlength: "10",
placeholder: "输入支付密码",
_i: 123
_i: 120
},
model: {
value: _vm._$g(123, "v-model"),
value: _vm._$g(120, "v-model"),
callback: function($$v) {
_vm.$handleVModelEvent(123, $$v)
_vm.$handleVModelEvent(120, $$v)
},
expression: "iv"
}
@@ -5055,7 +5027,7 @@ var render = function() {
1
)
],
{ _i: 121 }
{ _i: 118 }
)
],
2
@@ -5063,7 +5035,7 @@ var render = function() {
_c(
"u-modal",
{
attrs: { _i: 124 },
attrs: { _i: 121 },
on: {
cancel: function($event) {
return _vm.$handleViewEvent($event)
@@ -5077,35 +5049,35 @@ var render = function() {
_vm._t(
"default",
[
_vm._$g(126, "i")
_vm._$g(123, "i")
? _c(
"uni-view",
{ staticClass: _vm._$g(126, "sc"), attrs: { _i: 126 } },
{ staticClass: _vm._$g(123, "sc"), attrs: { _i: 123 } },
[
_c(
"uni-view",
{ staticClass: _vm._$g(127, "sc"), attrs: { _i: 127 } },
{ staticClass: _vm._$g(124, "sc"), attrs: { _i: 124 } },
[_vm._v("邀请码")]
),
_c(
"uni-view",
{ staticClass: _vm._$g(128, "sc"), attrs: { _i: 128 } },
{ staticClass: _vm._$g(125, "sc"), attrs: { _i: 125 } },
[_vm._v("请输入好友的邀请码")]
),
_c(
"uni-view",
{ staticClass: _vm._$g(129, "sc"), attrs: { _i: 129 } },
{ staticClass: _vm._$g(126, "sc"), attrs: { _i: 126 } },
[
_c("v-uni-input", {
attrs: {
type: "text",
placeholder: "输入邀请码",
_i: 130
_i: 127
},
model: {
value: _vm._$g(130, "v-model"),
value: _vm._$g(127, "v-model"),
callback: function($$v) {
_vm.$handleVModelEvent(130, $$v)
_vm.$handleVModelEvent(127, $$v)
},
expression: "invitation"
}
@@ -5118,27 +5090,27 @@ var render = function() {
)
: _c(
"uni-view",
{ staticClass: _vm._$g(131, "sc"), attrs: { _i: 131 } },
{ staticClass: _vm._$g(128, "sc"), attrs: { _i: 128 } },
[
_c(
"uni-view",
{ staticClass: _vm._$g(132, "sc"), attrs: { _i: 132 } },
{ staticClass: _vm._$g(129, "sc"), attrs: { _i: 129 } },
[_vm._v("邀请用户")]
),
_c(
"uni-view",
{ staticClass: _vm._$g(133, "sc"), attrs: { _i: 133 } },
{ staticClass: _vm._$g(130, "sc"), attrs: { _i: 130 } },
[_vm._v("请确认绑定关系用户信息")]
),
_c(
"uni-view",
{ staticClass: _vm._$g(134, "sc"), attrs: { _i: 134 } },
{ staticClass: _vm._$g(131, "sc"), attrs: { _i: 131 } },
[
_c("v-uni-image", {
attrs: {
src: _vm._$g(135, "a-src"),
src: _vm._$g(132, "a-src"),
mode: "aspectFill",
_i: 135
_i: 132
}
})
],
@@ -5146,19 +5118,19 @@ var render = function() {
),
_c(
"uni-view",
{ staticClass: _vm._$g(136, "sc"), attrs: { _i: 136 } },
[_vm._v(_vm._$g(136, "t0-0"))]
{ staticClass: _vm._$g(133, "sc"), attrs: { _i: 133 } },
[_vm._v(_vm._$g(133, "t0-0"))]
),
_c(
"uni-view",
{ staticClass: _vm._$g(137, "sc"), attrs: { _i: 137 } },
[_vm._v(_vm._$g(137, "t0-0"))]
{ staticClass: _vm._$g(134, "sc"), attrs: { _i: 134 } },
[_vm._v(_vm._$g(134, "t0-0"))]
)
],
1
)
],
{ _i: 125 }
{ _i: 122 }
)
],
2
@@ -32569,8 +32541,11 @@ var render = function() {
}),
_c(
"v-uni-swiper",
{ staticClass: _vm._$g(2, "sc"), attrs: { circular: true, _i: 2 } },
_vm._l(_vm._$g(3, "f"), function(item, $10, $20, $30) {
{
staticClass: _vm._$g(2, "sc"),
attrs: { circular: true, current: _vm._$g(2, "a-current"), _i: 2 }
},
_vm._l(_vm._$g(3, "f"), function(item, index, $20, $30) {
return _c(
"v-uni-swiper-item",
{
@@ -32680,7 +32655,7 @@ var render = function() {
},
_vm._l(_vm._$g(17 + "-" + $30, "f"), function(
it,
$11,
itIndex,
$21,
$31
) {

2
unpackage/dist/dev/app-plus/manifest.json vendored
View File

File diff suppressed because one or more lines are too long