other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2023-02-27

Browse Source 
功能完善
This commit is contained in:
guoxing
2023-02-27 18:10:06 +08:00
parent 837e8e6552
commit e40ca500b4
42 changed files with 1901 additions and 1841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mallplusui-uniapp-app/App.vue
View File

@@ -44,6 +44,7 @@
async sysInfoMethod() {
let params = {};
let list = await Api.apiCall('get', Api.index.sysInfo, params);
console.log('sysInfo>>>>>',sysInfo)
this.$db.set('sysInfo', list)
},

194
mallplusui-uniapp-app/components/uni-load-more/uni-load-more.vue
View File

@@ -1,194 +0,0 @@
<template>
<view class="uni-load-more">
<view class="uni-load-more__img" v-show="status === 'loading' && showIcon">
<view class="load1">
<view :style="{background:color}"></view>
<view :style="{background:color}"></view>
<view :style="{background:color}"></view>
<view :style="{background:color}"></view>
</view>
<view class="load2">
<view :style="{background:color}"></view>
<view :style="{background:color}"></view>
<view :style="{background:color}"></view>
<view :style="{background:color}"></view>
</view>
<view class="load3">
<view :style="{background:color}"></view>
<view :style="{background:color}"></view>
<view :style="{background:color}"></view>
<view :style="{background:color}"></view>
</view>
</view>
<text class="uni-load-more__text" :style="{color:color}">{{status === 'more' ? contentText.contentdown : (status === 'loading' ? contentText.contentrefresh : contentText.contentnomore)}}</text>
</view>
</template>
<script>
export default {
name: "uni-load-more",
props: {
status: {
//上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
type: String,
default: 'more'
},
showIcon: {
type: Boolean,
default: true
},
color: {
type: String,
default: "#777777"
},
contentText: {
type: Object,
default () {
return {
contentdown: "上拉显示更多",
contentrefresh: "正在加载...",
contentnomore: "没有更多数据了"
};
}
}
},
data() {
return {}
}
}
</script>
<style>
@charset "UTF-8";
.uni-load-more {
display: flex;
flex-direction: row;
height: 80upx;
align-items: center;
justify-content: center
}
.uni-load-more__text {
font-size: 28upx;
color: #999
}
.uni-load-more__img {
height: 24px;
width: 24px;
margin-right: 10px
}
.uni-load-more__img>view {
position: absolute
}
.uni-load-more__img>view view {
width: 6px;
height: 2px;
border-top-left-radius: 1px;
border-bottom-left-radius: 1px;
background: #999;
position: absolute;
opacity: .2;
transform-origin: 50%;
animation: load 1.56s ease infinite
}
.uni-load-more__img>view view:nth-child(1) {
transform: rotate(90deg);
top: 2px;
left: 9px
}
.uni-load-more__img>view view:nth-child(2) {
transform: rotate(180deg);
top: 11px;
right: 0
}
.uni-load-more__img>view view:nth-child(3) {
transform: rotate(270deg);
bottom: 2px;
left: 9px
}
.uni-load-more__img>view view:nth-child(4) {
top: 11px;
left: 0
}
.load1,
.load2,
.load3 {
height: 24px;
width: 24px
}
.load2 {
transform: rotate(30deg)
}
.load3 {
transform: rotate(60deg)
}
.load1 view:nth-child(1) {
animation-delay: 0s
}
.load2 view:nth-child(1) {
animation-delay: .13s
}
.load3 view:nth-child(1) {
animation-delay: .26s
}
.load1 view:nth-child(2) {
animation-delay: .39s
}
.load2 view:nth-child(2) {
animation-delay: .52s
}
.load3 view:nth-child(2) {
animation-delay: .65s
}
.load1 view:nth-child(3) {
animation-delay: .78s
}
.load2 view:nth-child(3) {
animation-delay: .91s
}
.load3 view:nth-child(3) {
animation-delay: 1.04s
}
.load1 view:nth-child(4) {
animation-delay: 1.17s
}
.load2 view:nth-child(4) {
animation-delay: 1.3s
}
.load3 view:nth-child(4) {
animation-delay: 1.43s
}
@-webkit-keyframes load {
0% {
opacity: 1
}
100% {
opacity: .2
}
}
</style>

4
mallplusui-uniapp-app/config/baseUrl.js
View File

@@ -5,11 +5,11 @@ if (process.env.NODE_ENV === 'development') {
// baseUrl = "http://localhost:7001/";
// socketUrl = "ws://localhost:8001/";
// baseUrl = "http://26077a35f5.wicp.vip:43609/";
baseUrl = "http://www.yyundong.com:8083/";
baseUrl = "http://mall.yyundong.com/portalapi/api/";
socketUrl = "ws://8192.168.43.195:8083/";
} else if (process.env.NODE_ENV === 'production') {
// 生产环境
baseUrl = "http://www.yyundong.com:8083/";
baseUrl = "http://mall.yyundong.com/portalapi/api/";
// baseUrl = "http://192.168.43.195:8083/";
socketUrl = "ws://192.168.43.195:8083/";
}

6
mallplusui-uniapp-app/manifest.json
View File

@@ -2,8 +2,8 @@
"name" : "汇融云链",
"appid" : "__UNI__FB2C9C4",
"description" : "",
"versionName" : "4.0.0.0",
"versionCode" : 4000,
"versionName" : "1.0.0.2",
"versionCode" : 1002,
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
@@ -148,7 +148,7 @@
"permission" : {}
},
"h5" : {
"title" : "宇运动商城",
"title" : "汇融云链",
"domain" : "https://www.yyundong.com:8088/h5",
"router" : {
"base" : ""

28
mallplusui-uniapp-app/pages.json
View File

@@ -11,14 +11,14 @@
"app-plus": {
"titleNView": {
"type": "transparent",
"searchInput": {
"backgroundColor": "rgba(231, 231, 231,.7)",
"borderRadius": "16px",
"placeholder": "请输入要查询的信息",
"disabled": true,
"placeholderColor": "#606266"
}
,
// "searchInput": {
// "backgroundColor": "rgba(231, 231, 231,.7)",
// "borderRadius": "16px",
// "placeholder": "请输入要查询的信息",
// "disabled": true,
// "placeholderColor": "#606266"
// }
// ,
"buttons": [{
"fontSrc": "/static/yticon.ttf",
"text": "",
@@ -171,7 +171,7 @@
}, {
"path": "pages/index/user",
"style": {
"navigationBarTitleText": "我的",
"navigationBarTitleText": "我的云链",
// #ifdef MP
"navigationStyle": "custom",
// #endif
@@ -182,7 +182,7 @@
"type": "transparent",
"buttons": [{
"fontSrc": "/static/yticon.ttf",
"text": "\ue60f",
"text": "",
"fontSize": "24",
"color": "#303133",
"width": "46px",
@@ -190,11 +190,11 @@
},
{
"fontSrc": "/static/yticon.ttf",
"text": "\ue744",
"text": "",
"fontSize": "28",
"color": "#303133",
"background": "rgba(0,0,0,0)",
"redDot": true
"background": "rgba(0,0,0,0)"
// "redDot": true
}
]
}
@@ -809,7 +809,7 @@
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "宇运动商城",
"navigationBarTitleText": "汇融云链",
"navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor": "#f8f8f8"
},

21
mallplusui-uniapp-app/pages/index/index.vue
View File

@@ -268,7 +268,7 @@
mapState
} from 'vuex';
import navBar from '@/components/zhouWei-navBar';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
coupon,
@@ -377,8 +377,8 @@
// console.log('val: ' + val)
// return item.id == val.id;
item => {
console.log('item_id: ' +JSON.parse(JSON.stringify(item)).id)
console.log('val_id: ' +JSON.parse(val).id)
console.log('item_id: ' + JSON.parse(JSON.stringify(item)).id)
console.log('val_id: ' + JSON.parse(val).id)
if (JSON.parse(JSON.stringify(item)).id == JSON.parse(val).id) {
return true
}
@@ -390,11 +390,14 @@
async sysInfoMethod() {
let params = {};
let list = this.$db.get('sysInfo')
if (!list) {
list = await Api.apiCall('get', Api.index.sysInfo, params);
this.$db.set('sysInfo', list)
}
// let list = this.$db.get('sysInfo')
console.log('sysInfo>>>>>1111111111111', 1111111111111111)
// if (!list) {
list = await Api.apiCall('get', Api.index.sysInfo, params);
console.log('sysInfo>>>>>2222222222', sysInfo)
this.$db.set('sysInfo', list)
// }
},
getCode() {
@@ -549,7 +552,7 @@
if (data) {
console.log("优惠券")
console.log("优惠券", data)
console.log("优惠券id",data[0].id)
console.log("优惠券id", data[0].id)
this.couponList = []
this.couponList = this.couponList.concat(data) || [];
}

2
mallplusui-uniapp-app/pages/index/nearbyBusiness.vue
View File

@@ -88,7 +88,7 @@
</template>
<script>
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import uniIcon from '@/components/uni-icon/uni-icon.vue';
import eonfox from '@/components/eonfox/eonfox.js';
import fns from '@/components/eonfox/fns.js';

8
mallplusui-uniapp-app/pages/index/user.vue
View File

@@ -35,7 +35,7 @@
</view>
</view>
<!-- <view class="vip-card-box" @click="toNav('../../pagesU/user/applyMember')"> -->
<view class="vip-card-box" @click="upData()">
<!-- <view class="vip-card-box" @click="upData()">
<image class="card-bg" src="/static/vip-card-bg.png" mode=""></image>
<view class="b-btn">立即升级</view>
<view class="tit" v-if="userDetailInfo">
@@ -44,7 +44,7 @@
</view>
<text class="e-m">汇融云链</text>
<text class="e-b">升级会员享受更多折扣 一测就上线</text>
</view>
</view> -->
</view>
<view class="cover-container" :style="[
@@ -64,10 +64,10 @@
<text class="num">{{ couponList.length || 0 }}</text>
<text>优惠券</text>
</view>
<view class="tj-item" @click="toNav('/pages/integral/home/home')">
<!-- <view class="tj-item" @click="toNav('/pages/integral/home/home')">
<text class="num">{{ userDetailInfo.integration || 0 }}</text>
<text>积分</text>
</view>
</view> -->
</view>
<!-- 订单 -->
<view class="order-section">

2
mallplusui-uniapp-app/pages/integral/home/home.vue
View File

@@ -47,7 +47,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

2
mallplusui-uniapp-app/pages/order/order.vue
View File

@@ -66,7 +66,7 @@
import { mapState } from 'vuex';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import empty from '@/components/empty';
import { formatDate } from '@/common/date';
export default {

2
mallplusui-uniapp-app/pages/order/orderDetail.vue
View File

@@ -77,7 +77,7 @@
import { mapState } from 'vuex';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import empty from '@/components/empty';
import Json from '@/Json';
import { formatDate } from '@/common/date';

235
mallplusui-uniapp-app/pages/set/set.vue
View File

@@ -1,33 +1,35 @@
<template>
<view class="container">
<view class="list-cell b-b m-t" @click="navTo('../../pagesU/user/profile')" hover-class="cell-hover" :hover-stay-time="50">
<view class="list-cell b-b m-t" @click="navTo('../../pagesU/user/profile')" hover-class="cell-hover"
:hover-stay-time="50">
<text class="cell-tit">个人资料</text>
<text class="cell-more yticon icon-you"></text>
</view>
<view class="list-cell b-b" @click="navTo('../../pagesU/address/address')" hover-class="cell-hover" :hover-stay-time="50">
<view class="list-cell b-b" @click="navTo('../../pagesU/address/address')" hover-class="cell-hover"
:hover-stay-time="50">
<text class="cell-tit">收货地址</text>
<text class="cell-more yticon icon-you"></text>
</view>
<view class="list-cell" @click="navTo('/pages/set/certification')" hover-class="cell-hover" :hover-stay-time="50">
<!-- <view class="list-cell" @click="navTo('/pages/set/certification')" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">实名认证</text>
<text class="cell-more yticon icon-you"></text>
</view>
</view> -->
<view class="list-cell m-t">
<!-- <view class="list-cell m-t">
<text class="cell-tit">消息推送</text>
<switch checked color="#fa436a" @change="switchChange" />
</view>
<view class="list-cell m-t b-b" @click="navTo('清除缓存')" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">清除缓存</text>
<text class="cell-more yticon icon-you"></text>
</view>
</view> -->
<!-- <view class="list-cell b-b" @click="navTo('关于Dcloud')" hover-class="cell-hover" :hover-stay-time="50">
<text class="cell-tit">关于{{ sysInfo.name }}</text>
<text class="cell-more yticon icon-you"></text>
</view> -->
<view class="list-cell" @click="updateApp()">
<text class="cell-tit">检查更新</text>
<!-- <text class="cell-tip">当前版本 {{sysInfo.version}}</text> -->
<text class="cell-tip">v {{version}}</text>
<text class="cell-more yticon icon-you"></text>
</view>
<view class="list-cell log-out-btn" @click="toLogout"><text class="cell-tit">退出登录</text></view>
@@ -36,114 +38,133 @@
</template>
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import { mapMutations } from 'vuex';
import APPUpdate from '../../plugins/APPUpdate/index.js'
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import {
mapMutations
} from 'vuex';
import APPUpdate, {
getCurrentNo
} from '../../plugins/APPUpdate/index.js'
export default {
components: {
mallplusCopyright
},
data() {
return {
sysInfo: '',
userInfo:{}
};
},
onLoad() {
this.sysInfo = this.$db.get('sysInfo');
},
methods: {
...mapMutations(['logout']),
navTo(url) {
uni.navigateTo({
url: url
});
this.$api.msg(`跳转到${url}`);
export default {
components: {
mallplusCopyright
},
//退出登录
toLogout() {
uni.showModal({
content: '确定要退出登录么',
success: e => {
if (e.confirm) {
this.logout();
this.$db.del('userInfos');
this.$db.del('token');
Api.apiCall('post', Api.index.logout, {});
setTimeout(() => {
uni.navigateBack();
}, 200);
data() {
return {
versionCode: "",
version: "",
};
},
onLoad() {
let that = this;
getCurrentNo(version => {
that.version = version.version
console.log("qqqq", that.version)
})
},
methods: {
...mapMutations(['logout']),
navTo(url) {
uni.navigateTo({
url: url
});
// this.$api.msg(`跳转到${url}`);
},
//退出登录
toLogout() {
uni.showModal({
content: '确定要退出登录么',
success: e => {
if (e.confirm) {
this.logout();
this.$db.del('token');
Api.apiCall('post', Api.index.logout, {});
setTimeout(() => {
uni.navigateBack();
}, 200);
}
}
}
});
},
//switch
switchChange(e) {
let statusTip = e.detail.value ? '打开' : '关闭';
this.$api.msg(`${statusTip}消息推送`);
},
updateApp() {
// true 没有新版本的时候有提示，默认：false
APPUpdate(true);
});
},
//switch
switchChange(e) {
let statusTip = e.detail.value ? '打开' : '关闭';
this.$api.msg(`${statusTip}消息推送`);
},
updateApp() {
console.log("qqqq", 11111111111111111);
// true 没有新版本的时候有提示，默认：false
APPUpdate(true);
}
}
}
};
};
</script>
<style lang="scss">
page {
background: $page-color-base;
}
.list-cell {
display: flex;
align-items: baseline;
padding: 20upx;
line-height: 60upx;
position: relative;
background: #fff;
justify-content: center;
&.log-out-btn {
margin-top: 40upx;
border-radius: 50upx;
width: 95%;
margin-left: 2.5%;
background: $uni-color-primary;
page {
background: $page-color-base;
}
.list-cell {
display: flex;
align-items: baseline;
padding: 20upx;
line-height: 60upx;
position: relative;
background: #fff;
justify-content: center;
&.log-out-btn {
margin-top: 40upx;
border-radius: 50upx;
width: 95%;
margin-left: 2.5%;
background: $uni-color-primary;
.cell-tit {
color: #ffffff;
text-align: center;
margin-right: 0;
}
}
&.cell-hover {
background: #fafafa;
}
&.b-b:after {
left: 30upx;
}
&.m-t {
margin-top: 16upx;
}
.cell-more {
align-self: baseline;
font-size: $font-lg;
color: $font-color-light;
margin-left: 10upx;
}
.cell-tit {
color: #ffffff;
text-align: center;
margin-right: 0;
flex: 1;
font-size: $font-base + 2upx;
color: $font-color-dark;
margin-right: 10upx;
}
.cell-tip {
font-size: $font-base;
color: $font-color-light;
}
switch {
transform: translateX(16upx) scale(0.84);
}
}
&.cell-hover {
background: #fafafa;
}
&.b-b:after {
left: 30upx;
}
&.m-t {
margin-top: 16upx;
}
.cell-more {
align-self: baseline;
font-size: $font-lg;
color: $font-color-light;
margin-left: 10upx;
}
.cell-tit {
flex: 1;
font-size: $font-base + 2upx;
color: $font-color-dark;
margin-right: 10upx;
}
.cell-tip {
font-size: $font-base;
color: $font-color-light;
}
switch {
transform: translateX(16upx) scale(0.84);
}
}
</style>

2
mallplusui-uniapp-app/pagesA/after_sale/list.vue
View File

@@ -55,7 +55,7 @@
import { mapState } from 'vuex';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import empty from '@/components/empty';
import { formatDate } from '@/common/date';
export default {

2
mallplusui-uniapp-app/pagesA/build/community.vue
View File

@@ -117,7 +117,7 @@
mapState
} from 'vuex';
import navBar from '@/components/zhouWei-navBar';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
coupon,

2
mallplusui-uniapp-app/pagesA/build/communityList.vue
View File

@@ -42,7 +42,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
uniLoadMore

2
mallplusui-uniapp-app/pagesA/build/floorList.vue
View File

@@ -31,7 +31,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
uniLoadMore

2
mallplusui-uniapp-app/pagesA/build/groupList.vue
View File

@@ -42,7 +42,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
uniLoadMore

2
mallplusui-uniapp-app/pagesA/product/discountList.vue
View File

@@ -42,7 +42,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
uniLoadMore

2
mallplusui-uniapp-app/pagesA/product/giftList.vue
View File

@@ -43,7 +43,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

2
mallplusui-uniapp-app/pagesA/product/groupActivityList.vue
View File

@@ -30,7 +30,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

2
mallplusui-uniapp-app/pagesA/product/groupList.vue
View File

@@ -43,7 +43,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

2
mallplusui-uniapp-app/pagesA/product/list.vue
View File

@@ -70,7 +70,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

2
mallplusui-uniapp-app/pagesA/product/paiMaiList.vue
View File

@@ -43,7 +43,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

2177
mallplusui-uniapp-app/pagesA/product/product.vue
View File

File diff suppressed because it is too large Load Diff

2
mallplusui-uniapp-app/pagesA/product/tagGoodslist.vue
View File

@@ -68,7 +68,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

2
mallplusui-uniapp-app/pagesC/seller/goods.vue
View File

@@ -51,7 +51,7 @@
import { mapState } from 'vuex';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import empty from '@/components/empty';
import { formatDate } from '@/common/date';
export default {

2
mallplusui-uniapp-app/pagesC/seller/member.vue
View File

@@ -32,7 +32,7 @@
import { mapState } from 'vuex';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import empty from '@/components/empty';
import { formatDate } from '@/common/date';
export default {

2
mallplusui-uniapp-app/pagesC/seller/order.vue
View File

@@ -61,7 +61,7 @@
import { mapState } from 'vuex';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import empty from '@/components/empty';
import { formatDate } from '@/common/date';
export default {

2
mallplusui-uniapp-app/pagesC/seller/orderDetail.vue
View File

@@ -70,7 +70,7 @@
import { mapState } from 'vuex';
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import empty from '@/components/empty';
import Json from '@/Json';
import { formatDate } from '@/common/date';

2
mallplusui-uniapp-app/pagesC/store/businessDetails.vue
View File

@@ -235,7 +235,7 @@ import { formatDate } from '@/common/date';
import uniIcon from "@/components/uni-icon/uni-icon.vue";
import eonfox from "@/components/eonfox/eonfox.js"
import fns from '@/components/eonfox/fns.js';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
// #ifdef H5
let jweixin = require('jweixin-module');
// #endif

2
mallplusui-uniapp-app/pagesC/store/list.vue
View File

@@ -13,7 +13,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

2
mallplusui-uniapp-app/pagesC/store/schoolList.vue
View File

@@ -24,7 +24,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
uniLoadMore

2
mallplusui-uniapp-app/pagesC/store/store.vue
View File

@@ -98,7 +98,7 @@ import coupon from '@/components/coolc-coupon/coolc-coupon';
import { formatDate } from '@/common/date';
import { mapState } from 'vuex';
import navBar from '@/components/zhouWei-navBar';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import share from '@/components/share';
export default {
components: {

2
mallplusui-uniapp-app/pagesC/store/storeList.vue
View File

@@ -31,7 +31,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

10
mallplusui-uniapp-app/pagesU/notice/subjectDetail.vue
View File

@@ -11,11 +11,11 @@
<view class="introduce-section">
<text class="title">{{ detailData.title }}</text>
<view class="bot-row">
<!-- <view class="bot-row">
<text>收藏量: {{ detailData.collectCount }}</text>
<text>评论量: {{ detailData.commentCount }}</text>
<text>浏览量: {{ detailData.readCount }}</text>
</view>
</view> -->
</view>
<view class="c-list">
@@ -32,7 +32,7 @@
</view>
<!-- 底部操作菜单 -->
<view class="page-bottom">
<!-- <view class="page-bottom">
<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
<text class="yticon icon-xiatubiao--copy"></text>
<text>首页</text>
@@ -42,10 +42,10 @@
<text class="yticon icon-shoucang"></text>
<text>收藏</text>
</view>
</view>
</view> -->
<!-- 分享 -->
<share ref="share" :contentHeight="580" :shareList="shareList"></share>
<!-- <share ref="share" :contentHeight="580" :shareList="shareList"></share> -->
</view>
</template>

7
mallplusui-uniapp-app/pagesU/notice/subjectList.vue
View File

@@ -11,13 +11,13 @@
<text>{{item.title}}</text>
<text class="listcard-content_title_text">发布时间：{{item.createTime | formatCreateTime}}</text>
</view>
<view class="listcard-content_des">
<!-- <view class="listcard-content_des">
<view class="listcard-content_des-label">
<view class="listcard-content_des-label-item">收藏{{item.collectCount}}</view>
</view>
<view class="listcard-content_des-browe">浏览{{item.readCount}}</view>
</view>
</view> -->
</view>
</view>
</view>
@@ -167,6 +167,7 @@
text {
font-size: 22px;
margin-top: 5px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
@@ -175,7 +176,7 @@
}
.listcard-content_title_text {
margin-top: 5px;
margin-top: 28px;
font-size: 15px;
color: #999;
}

2
mallplusui-uniapp-app/pagesU/notice/subjectList_02_14.vue
View File

@@ -39,7 +39,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
export default {
components: {
mallplusCopyright,

973
mallplusui-uniapp-app/pagesU/user/collect.vue
View File

File diff suppressed because it is too large Load Diff

2
mallplusui-uniapp-app/pagesU/user/inviteList.vue
View File

@@ -24,7 +24,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue'
import { formatDate } from '@/common/date';
export default {
components: {

2
mallplusui-uniapp-app/pagesU/user/inviteMoney.vue
View File

@@ -32,7 +32,7 @@
<script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api';
import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
import empty from '@/components/empty';
export default {
components: {

15
mallplusui-uniapp-app/plugins/APPUpdate/index.js
View File

@@ -9,10 +9,11 @@ const $iconUrl = "/static/icon/ic_ar.png";
// 获取当前应用的版本号
export const getCurrentNo = function(callback) {
// 获取本地应用资源版本号
console.log("》》》》", 11111111111111111);
plus.runtime.getProperty(plus.runtime.appid, function(inf) {
callback && callback({
versionCode: inf.version.replace(/\./g, ""),
version: inf.version
version: inf.version,
});
});
}
@@ -24,7 +25,7 @@ export const getServerNo = function(version, isPrompt = false, callback) {
let userName = userInfos.username;
let httpData = {
version: version,
userName:userName
userName: userName
};
console.log(userName)
if (platform == "android") {
@@ -32,11 +33,12 @@ export const getServerNo = function(version, isPrompt = false, callback) {
} else {
httpData.type = 1102;
}
console.log("》》》》", 222222);
/* 接口入参说明
* version: 应用当前版本号（已自动获取）
* type：平台（1101是安卓，1102是IOS）
*/
$http.get("api/appVersion/versioninfo", httpData, {
$http.get("appVersion/versioninfo", httpData, {
isPrompt: isPrompt
}).then(res => {
/* res的数据说明
@@ -48,6 +50,7 @@ export const getServerNo = function(version, isPrompt = false, callback) {
* | forceUpdate | y | boolean | 是否强制更新 |
* | downloadUrl | y | String | 版本下载链接（IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接） |
*/
console.log("》》》》", 333333333);
console.log(res)
console.log(JSON.parse(res));
console.log(JSON.stringify(JSON.parse(res)))
@@ -76,6 +79,7 @@ export const getDownload = function(res) {
let file = data.fileName
let dtask;
let lastProgressValue = 0;
console.log("》》》》", 44444444);
downloadPopup(popupData, function(res) {
dtask = plus.downloader.createDownload(data.downloadUrl, {
// filename: '_doc/update/' + file + '/' + new Date().getTime() + '/'
@@ -670,7 +674,8 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) {
} else if (buttonNum == 2) {
// 双按钮
let buttonWidth = (popupViewData.viewContentWidth - popupViewData.viewContentPadding) / 2;
if (e.clientX > popupViewData.viewContentPadding && e.clientX < maxLeft - buttonWidth - popupViewData.viewContentPadding) {
if (e.clientX > popupViewData.viewContentPadding && e.clientX < maxLeft - buttonWidth -
popupViewData.viewContentPadding) {
maskLayer.hide();
popupView.hide();
cancelCallback && cancelCallback();
@@ -781,8 +786,10 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) {
}
export default function(isPrompt = false) {
getCurrentNo(version => {
console.log("》》》》", version);
getServerNo(version.versionCode, isPrompt, data => {
let res = JSON.parse(data);
console.log("》》》》", 6666666);
if (res.forceUpdate) {
if (/\.wgt$/i.test(res.downloadUrl)) {
getDownload(res);

7
mallplusui-uniapp-app/plugins/request/request.js
View File

@@ -18,7 +18,8 @@ export default class request {
// 获取默认信息
getDefault(data, options = {}) {
//判断url是不是链接
let urlType = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~/])+$/.test(data.url);
let urlType = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~/])+$/.test(
data.url);
let config = Object.assign({}, this.config, options, data);
if (data.method == "FILE") {
config.url = urlType ? data.url : this.fileUrl + data.url;
@@ -88,6 +89,7 @@ export default class request {
return;
}
let requestInfo = this.getDefault(data);
//请求前回调
if (this.requestStart) {
let requestStart = this.requestStart(requestInfo);
@@ -110,9 +112,12 @@ export default class request {
return;
}
}
console.log("url: requestInfo.url》》》》", requestInfo.url)
console.log("url: requestInfo.header》》》》", requestInfo.header)
let requestData = {
url: requestInfo.url,
header: requestInfo.header, //加入请求头
success: (res) => {
//请求完成回调
this.requestEnd && this.requestEnd(requestInfo, res);