mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-03-19 16:23:42 +08:00
parent e4695c875d
commit f53634b3c1
16 changed files with 646 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/store.js
View File

@ -13,8 +13,8 @@ import request from "@/utils/request.js";
* @param int id
*
*/
export function getProductDetail(id) {
return request.get('store/product/detail/' + id, {}, {
export function getProductDetail(id, data) {
return request.get('store/product/detail/' + id, data, {
noAuth: true
});
}
@ -23,8 +23,8 @@ export function getProductDetail(id) {
* @param int id
*
*/
export function getProductParmas(id) {
return request.get('store/product/show/' + id, {}, {
export function getProductParmas(id, data) {
return request.get('store/product/show/' + id, data, {
noAuth: true
});
}
@ -33,8 +33,8 @@ export function getProductParmas(id) {
* @param int id
*
*/
export function getStoreRecommend(id) {
return request.get('store/product/good_list/' + id, {}, {
export function getStoreRecommend(id, data) {
return request.get('store/product/good_list/' + id, data, {
noAuth: true
});
}

14
pages/goods_details/index.vue
View File

@ -212,10 +212,10 @@
<view class="store-wrapper" v-if="storeInfo.merchant && hide_mer_status !=1">
<view class="store-hd skeleton-rect">
<view v-if="storeInfo.merchant&&hide_mer_status != 1" class="store-info">
<navigator :url="'/pages/store/home/index?id='+storeInfo.mer_id" hover-class="none" class="logo">
<navigator :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" hover-class="none" class="logo">
<image :src="storeInfo.merchant.mer_avatar" mode=""></image>
</navigator>
<navigator :url="'/pages/store/home/index?id='+storeInfo.mer_id" hover-class="none" class="info">
<navigator :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" hover-class="none" class="info">
<view class="name line1">
<text>{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
<image v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10" :src="margin_ico" class="store-margin"></image>
@ -227,7 +227,7 @@
</view>
<view v-else class="txt">0人关注</view>
</navigator>
<navigator v-if="hide_mer_status != 1" :url="'/pages/store/home/index?id='+storeInfo.mer_id" class="link"
<navigator v-if="hide_mer_status != 1" :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" class="link"
hover-class="none">进店</navigator>
</view>
<view class="score-wrapper">
@ -245,7 +245,7 @@
<view v-if="recommend && recommend.length > 0 && false" class="con-box">
<view class="acea-row row-between">
<view class="title">店铺推荐</view>
<navigator v-if="hide_mer_status!=1" class="moer-btn" :url="'/pages/store/home/index?id='+storeInfo.mer_id" hover-class="none">
<navigator v-if="hide_mer_status!=1" class="moer-btn" :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" hover-class="none">
查看更多<text class='iconfont icon-jiantou'></text></navigator>
</view>
<view class="swiper page_swiper">
@ -307,7 +307,7 @@
</scroll-view>
</view>
<view class='footer acea-row row-between-wrapper' :class="{'footpl':hide_mer_status==1}">
<navigator v-if="hide_mer_status !=1" :url="'/pages/store/home/index?id='+storeInfo.mer_id" class='item skeleton-rect'>
<navigator v-if="hide_mer_status !=1" :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" class='item skeleton-rect'>
<view class='iconfont icon-dianpu2'></view>
<view>店铺</view>
</navigator>
@ -1066,7 +1066,9 @@
mask: true
});
let that = this;
getProductDetail(that.id).then(res => {
getProductDetail(that.id,{
sale_type: this.sale_type
}).then(res => {
uni.hideLoading();
let storeInfo = res.data;
if (storeInfo.video_link && storeInfo.slider_image.length > 1) {

1
pages/index/index.vue
View File

@ -939,6 +939,7 @@
let that = this;
getUserInfo().then(res => {
that.userInfo = res.data;
this.$store.commit('SET_USERINFO', res.data);
});
},
// 记录会员访问

34
pages/order_addcart/order_addcart.vue
View File

@ -191,6 +191,9 @@
import {
getNavigation
} from "@/api/public";
import {
getUserInfo
} from '@/api/user.js';
import customTab from '@/components/customTab';
import {
getCartList,
@ -287,6 +290,10 @@
currSku: '',
newData: {},
activeRouter: '',
userInfo: {},
mer_info: {
mer_settlement_agree_status: 0
}
};
},
computed: configMap({
@ -297,18 +304,20 @@
onReady() {},
mounted: function() {},
onLoad: function(options) {
if(this.$store.state.app.userInfo.mer_info.mer_settlement_agree_status) this.tabsArr.push({
name: '商户购物车',
val: 2
})
},
onShow: function() {
let that = this
let routes = getCurrentPages();
let curRoute = routes[routes.length - 1].route
let curRoute = routes[routes.length - 1].route;
this.activeRouter = '/' + curRoute
this.getNav();
if (this.isLogin == true) {
if(this.$store.state.app.userInfo.mer_info.mer_settlement_agree_status) this.tabsArr.push({
name: '商户购物车',
val: 2
})
else this.getUserInfo();
this.getCartList();
this.getCartNum();
this.goodsHidden = true;
@ -346,6 +355,21 @@
this.subsecCurr = e;
},
/**
* 获取个人用户信息
*/
getUserInfo: function() {
let that = this;
getUserInfo().then(res => {
that.userInfo = res.data;
if(res.data.mer_info.mer_settlement_agree_status) this.tabsArr.push({
name: '商户购物车',
val: 2
})
this.$store.commit('SET_USERINFO', res.data);
});
},
goRouter(item) {
var pages = getCurrentPages();
var page = (pages[pages.length - 1]).$page.fullPath;

30
store/modules/app.js
View File

@ -17,6 +17,12 @@ import {
USER_INFO
} from '../../config/cache';
import Cache from '../../utils/cache';
// #ifdef APP-PLUS
import Updater from '@/uni_modules/guyue-updater/index';
import { Toast } from "../../libs/uniApi.js";
// #endif
const state = {
location: Cache.get('LOCATION_DATA', true) || {},
token: Cache.get(LOGIN_STATUS) || null,
@ -126,7 +132,7 @@ const actions = {
})
await uni.$u.sleep(500)
}
const wgt_v = uni.getStorageSync('wgt_version') || '1.0.0';
// #ifdef APP-PLUS
let os = uni.getSystemInfoSync();
let apptype;
@ -152,9 +158,7 @@ const actions = {
// title: '检查更新中'
// })
// 版本更新
if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
compareVersions(res.data.appInfo.version,
wgt_v) == 1) {
if (compareVersions(res.data.appInfo.version, os.appWgtVersion) == 1) {
try {
let info = res.data.appInfo || {};
let version = {
@ -166,7 +170,6 @@ const actions = {
force: info.force == 1 ? true : false, // 是否强制更新
quiet: info.quiet == 1 ? true : false // 是否静默更新
}
Updater.update(version,res.data.appInfo);
} catch (e) {
console.log(e);
@ -182,6 +185,7 @@ const actions = {
if(data) Toast('已经是最新版本了')
}
}).catch((err) => {
console.log(err);
if(data) uni.hideLoading()
Toast(err.msg||err.message||err)
// console.log(err)
@ -192,6 +196,22 @@ const actions = {
}
};
function compareVersions(version1, version2) {
const arr1 = version1.split('.').map(Number);
const arr2 = version2.split('.').map(Number);
for (let i = 0; i < Math.max(arr1.length, arr2.length); i++) {
const num1 = i < arr1.length ? arr1[i] : 0;
const num2 = i < arr2.length ? arr2[i] : 0;
if (num1 > num2) {
return 1;
} else if (num1 < num2) {
return -1;
}
}
return 0;
}
export default {
state,
mutations,

BIN
uni_modules/guyue-updater/assets/bg1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
uni_modules/guyue-updater/assets/bg1_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
uni_modules/guyue-updater/assets/bg2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
uni_modules/guyue-updater/assets/close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

6
uni_modules/guyue-updater/changelog.md Normal file
View File

@ -0,0 +1,6 @@
## 1.0.2（2023-06-02）
修复部分bug，新增条件编译，仅限app平台调用
## 1.0.1（2023-06-02）
去除ts，使用js进行开发，兼容性更好
## 1.0.0（2023-05-04）
完成初始功能，支持apk安装以及wgt升级，支持显示弹窗升级、静默更新以及强制更新，支持进度显示，支持覆盖原生tabbar、原生导航栏

25
uni_modules/guyue-updater/index.js Normal file
View File

@ -0,0 +1,25 @@
import { download, install } from "./updater";
export default class Updater {
static async update(options ) {
// #ifdef APP-PLUS
// 静默更新
console.log('更新');
if (options.quiet) {
download({
url: options.downUrl,
onSuccess(filePath) {
install(filePath, false, options.versionName);
},
});
} else if (options.downUrl) {
uni.navigateTo({
url: `/uni_modules/guyue-updater/pages/updater?data=${encodeURIComponent(JSON.stringify(options))}`,
animationType: "fade-in",
animationDuration: 200,
});
}
// #endif
}
}

12
uni_modules/guyue-updater/interface.ts Normal file
View File

@ -0,0 +1,12 @@
export type UpdateParams = {
content: string; // 必填，更新内容，内容中使用 \n 进行换行
downUrl: string; // 必填，wgt热更新请给出 .wgt 的文件地址，APK整包更新请设置下载apk地址，ios请设置苹果商店的连接地址;
title?: string; // 用于显示弹窗标题，默认 发现新版本
versionName?: string; // 版本名，用于显示更新版本，如 1.0.0
quiet?: boolean; // 是否是静默更新，开启后，不会有弹窗，会在后台下载更新文件，在下次启动APP时使用更新
force?: boolean; // 是否是强制更新，开启后，弹窗无法被关闭，必须更新
updateBtnText?: string; // 升级按钮文字，默认 立即升级
downMsgTip?: string; // 仅android，默认 下载中，请稍后
downSucTip?: string; // 仅android，默认 下载完成，安装中
downErrorTip?: string; // 仅android，默认 下载失败，请重试
}

82
uni_modules/guyue-updater/package.json Normal file
View File

@ -0,0 +1,82 @@
{
"id": "guyue-updater",
"displayName": "App版本升级弹框和进度提示",
"version": "1.0.2",
"description": "app热更新模块，支持apk安装以及wgt升级，支持显示弹窗升级、静默更新以及强制更新，支持进度显示，支持覆盖原生tabar，原生导航栏",
"keywords": [
"热更新",
"进度提示",
"版本升级",
"app自动升级",
"wgt自动升级"
],
"repository": "",
"engines": {
"HBuilderX": "^3.4.9"
},
"dcloudext": {
"type": "sdk-js",
"sale": {
"regular": {
"price": "9.98"
},
"sourcecode": {
"price": "16.80"
}
},
"contact": {
"qq": "2292550932"
},
"declaration": {
"ads": "无",
"data": "插件不采集任何数据",
"permissions": "无"
},
"npmurl": ""
},
"uni_modules": {
"dependencies": [],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y"
},
"client": {
"Vue": {
"vue2": "y",
"vue3": "y"
},
"App": {},
"H5-mobile": {
"Safari": "n",
"Android Browser": "n",
"微信浏览器(Android)": "n",
"QQ浏览器(Android)": "n"
},
"H5-pc": {
"Chrome": "n",
"IE": "n",
"Edge": "n",
"Firefox": "n",
"Safari": "n"
},
"小程序": {
"微信": "n",
"阿里": "n",
"百度": "n",
"字节跳动": "n",
"QQ": "n",
"钉钉": "n",
"快手": "n",
"飞书": "n",
"京东": "n"
},
"快应用": {
"华为": "n",
"联盟": "n"
}
}
}
}
}

356
uni_modules/guyue-updater/pages/updater.vue Normal file
View File

@ -0,0 +1,356 @@
<template>
<view class="container">
<view class="main" @click.stop="">
<view class="header">
<view class="bg1" style="display: flex;justify-content: center;align-items: center;">
<view style="text-align: center; color: #fff;font-size: 34rpx;">发现新版本</view>
</view>
<view class="bg2"></view>
<!-- <image src="../assets/bg1.png" class="bg1" /> -->
<!-- <image src="../assets/bg2.png" class="bg2" /> -->
<!-- <view class="version-title">{{ updateParams.title }}</view> -->
<!-- <view class="version-name" v-if="updateParams.versionName">V{{ updateParams.versionName }}</view> -->
</view>
<view style="color: #333;padding-left: 30rpx;">{{ updateParams.title }} </view>
<view class="title">V{{ updateParams.versionName }} 更新内容</view>
<view class="content">
<rich-text :nodes="content" />
</view>
<view class="progress" v-if="downloading">
<view class="slider">
<view class="active-slider" :style="{ width: `${progress}%` }">
<view class="bar" />
<view class="dot">
<view class="text">{{ progress }}%</view>
<view class="circle" />
</view>
</view>
</view>
</view>
<view class="button" :class="{'active': !downloading || downloadError}" @click="handleButton">
{{ downloadText }}
</view>
</view>
<view class="bottom" v-if="!updateParams.force" @click="back">
<view class="line" />
<image src="../assets/close.png" class="close" />
</view>
</view>
</template>
<script>
import {
download,
install
} from "../updater";
export default {
data() {
const data = {
updateParams: {},
progress: 0,
downloading: false,
downloadSucc: false,
downloadError: false,
};
return data;
},
computed: {
content() {
return (this.updateParams.content || '').replace(/[\r\n]/gim, '<br/>');
},
downloadText() {
if (this.downloadSucc) {
return this.updateParams.downSucTip;
}
if (this.downloadError) {
return this.updateParams.downErrorTip;
}
if (this.downloading) {
return this.updateParams.downMsgTip;
}
return this.updateParams.updateBtnText;
},
},
onLoad(params) {
const data = {
title: '发现新版本',
updateBtnText: '立即升级',
downMsgTip: '正在更新中',
downSucTip: '下载完成，安装中',
downErrorTip: '下载失败，请重试',
quiet: false,
force: false,
...(JSON.parse(decodeURIComponent(params.data)))
};
this.updateParams = data;
},
onBackPress() {
return this.updateParams.force;
},
methods: {
back() {
if (!this.updateParams.force) {
uni.navigateBack();
}
},
// 开始更新
start() {
if (!this.updateParams.downUrl) {
return;
}
// ios 跳转到appstore，.apk、.wgt 直接安装更新
const isResource = ['.apk', '.wgt'].some(ext => this.updateParams.downUrl.toLocaleLowerCase().includes(
ext));
if (plus.os.name !== "Android" || !isResource) {
plus.runtime.openURL(this.updateParams.downUrl);
return;
}
this.downloading = true;
const self = this;
download({
url: self.updateParams.downUrl,
onProgress(progress) {
self.progress = progress;
},
onSuccess(filePath) {
self.downloadSucc = true;
self.downloadError = false;
install(filePath, true);
},
onFail() {
self.downloading = false;
self.downloadSucc = false;
self.downloadError = true;
},
});
},
handleButton() {
if (this.updateParams.brand.length > 0) {
if (plus.os.name == "Android") {
// 跳转安卓应用市场
let appurl = this.updateParams.downUrl //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数
plus.runtime.openURL(appurl)
setTimeout((res) => {
this.back()
}, 1000)
} else {
// 跳转AppStore
plus.runtime.launchApplication({
action: this.updateParams.downUrl,
})
setTimeout((res) => {
this.back()
}, 1000)
}
} else {
if (!this.downloading) {
return this.start();
}
if (this.downloadError) {
this.progress = 0;
this.downloading = false;
this.downloadSucc = false;
this.downloadError = true;
return this.start();
}
}
},
},
};
</script>
<style lang="less">
page {
width: 100vw;
height: 100vh;
background: transparent;
}
.container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.3);
}
.main {
width: 75%;
// background-color: #fff;
border-radius: 8rpx;
padding-bottom: 10rpx;
background-image: url('../assets/bg1.png');
background-size: 100% 100%;
}
.header {
position: relative;
.bg1 {
width: 100%;
height: calc(100vw * 0.305);
border-top-left-radius: 8rpx;
border-top-right-radius: 8rpx;
}
.bg2 {
position: absolute;
top: -40%;
right: 13%;
width: 35.9%;
height: calc(100vw * 0.5441);
}
.version-title {
position: absolute;
top: 13%;
left: 8%;
color: #961c00;
font-size: 40rpx;
}
.version-name {
position: absolute;
top: 36%;
left: 24%;
background-color: #e54139;
color: #fff;
font-size: 26rpx;
line-height: 26rpx;
padding: 8rpx 20rpx;
border-radius: 20rpx;
}
}
.title {
background-color: #ff6d20;
color: #fff;
display: inline-block;
margin-top: 12rpx;
margin-left: 30rpx;
font-size: 26rpx;
line-height: 26rpx;
padding: 8rpx 20rpx;
border-radius: 8rpx;
}
.content {
margin-top: 12rpx;
margin-left: 30rpx;
font-size: 28rpx;
line-height: 2;
max-height: 240rpx;
overflow-y: auto;
}
.button {
margin: 20rpx 30rpx;
background-color: #ff6d20;
color: #fff;
font-size: 30rpx;
text-align: center;
padding: 20rpx 0;
border-radius: 14rpx;
opacity: 0.5;
pointer-events: none;
&:active {
opacity: 0.6;
}
&.active {
opacity: 1;
pointer-events: initial;
}
}
.progress {
padding: 50rpx 50rpx 18rpx;
.slider {
position: relative;
width: 100%;
height: 10rpx;
border-radius: 5rpx;
background-color: #e2e2e2;
.active-slider {
display: flex;
flex-direction: row;
align-items: center;
position: absolute;
left: 0;
top: 0;
width: 0%;
height: 10rpx;
border-radius: 5rpx;
.bar {
flex: 1;
height: 100%;
background-color: #e84116;
border-top-left-radius: 5rpx;
border-bottom-left-radius: 5rpx;
}
.dot {
position: relative;
margin-left: -12rpx;
.text {
position: absolute;
top: -34rpx;
left: -50%;
color: #e84116;
font-size: 24rpx;
font-weight: 500;
}
.circle {
width: 12rpx;
height: 12rpx;
border: 6rpx solid #e84116;
border-radius: 50%;
background-color: #fff;
}
}
}
}
}
.bottom {
display: flex;
flex-direction: column;
align-items: center;
.line {
width: 3rpx;
height: 50rpx;
background-color: #fff;
}
.close {
width: 64rpx;
height: 64rpx;
margin-top: -4rpx;
}
}
</style>

65
uni_modules/guyue-updater/readme.md Normal file
View File

@ -0,0 +1,65 @@
# App热更新
App热更新模块，支持apk安装以及wgt升级，支持显示弹窗升级、静默更新以及强制更新，支持进度显示，支持覆盖原生tabbar、原生导航栏。
可用于自建热更新渠道，不依赖于云服务，无云服务费用支出，也可以适配官方更新中心。
## 使用说明
### 1.将此项目导入自己的项目工程
### 2.在page.json中注册页面，如下
```javascript
{
"path": "uni_modules/guyue-updater/pages/updater",
"style": {
"navigationStyle": "custom",
"backgroundColor": "transparent",
"disableScroll": true,
"app-plus": {
"backgroundColorTop": "transparent",
"background": "transparent",
"scrollIndicator": false,
"titleNView": false,
"popGesture": "none",
"bounce": "none",
"animationType": "fade-in",
"animationDuration": 200
}
}
}
```
### 3.将版本检测函数导入需要使用的页面
一般在App.vue中的onLaunch导入或者首页导入，需要自行完成热更新检查，一般在APP启动时发起一个请求获取热更新数据，数据获取后，可以调用该组件完成更新。
```javascript
import Updater from '@/uni_modules/guyue-updater/index';
// 仅在app平台有效，其他平台调用无效
Updater.update({
title: '发现新版本',
content: '1. 我们更新了新的UI设计\n2. 我们更新了新的UI设计\n3. 我们更新了新的UI设计\n4. 我们更新了新的UI设计\n',
versionName: '1.3.6',
downUrl: 'https://cdn.xxx.cn/mp/__UNI__1F29D65.wgt',
force: false,
})
```
## 参数说明
```javascript
export type UpdateParams = {
content: string; // 必填，更新内容，内容中使用 \n 进行换行
downUrl: string; // 必填，wgt热更新请给出 .wgt 的文件地址，APK整包更新请设置下载apk地址，ios请设置苹果商店的连接地址;
title?: string; // 用于显示弹窗标题，默认 发现新版本
versionName?: string; // 版本名，用于显示更新版本，如 1.0.0
quiet?: boolean; // 是否是静默更新，开启后，不会有弹窗，会在后台下载更新文件，在下次启动APP时使用更新
force?: boolean; // 是否是强制更新，开启后，弹窗无法被关闭，必须更新
updateBtnText?: string; // 升级按钮文字，默认 立即升级
downMsgTip?: string; // 仅android，默认 下载中，请稍后
downSucTip?: string; // 仅android，默认 下载完成，安装中
downErrorTip?: string; // 仅android，默认 下载失败，请重试
}
```
## Android如何跳转到应用市场更新
downUrl 设置为应用市场的地址即可，如： market://details?id={这里写你的应用包名}
## iOS 如何跳转到AppStore
downUrl 设置为AppStore的地址即可，如： itms-apps://itunes.apple.com/cn/app/hello-uni-app/id1417078253

31
uni_modules/guyue-updater/updater.js Normal file
View File

@ -0,0 +1,31 @@
export const download = ({ url, onProgress, onSuccess, onFail }) => {
const task = uni.downloadFile({
url,
success(res) {
if (res.statusCode === 200) {
onSuccess && onSuccess(res.tempFilePath);
}
},
fail() {
onFail && onFail();
}
});
task.onProgressUpdate(res => {
onProgress && onProgress(res.progress);
});
};
export const install = (filePath, restart = false, version='') => {
plus.runtime.install(filePath, {
force: true
}, () => {
console.log('install success...');
if (restart) {
uni.setStorageSync('wgt_version', version);
plus.runtime.restart();
}
}, (e) => {
console.error('install fail...', e);
});
};