diff --git a/App.vue b/App.vue
index b81fc25..64804e3 100644
--- a/App.vue
+++ b/App.vue
@@ -1,156 +1,187 @@
\ No newline at end of file
diff --git a/common/config.js b/common/config.js
new file mode 100644
index 0000000..53f6f6c
--- /dev/null
+++ b/common/config.js
@@ -0,0 +1,177 @@
+import RequestManager from '@/common/request.js'
+/**
+ * 全局配置工具类
+ * 用于项目启动时加载全局配置数据并缓存
+ */
+
+// 数据缓存对象
+let configData = null;
+let isLoading = false;
+let loadPromise = null;
+
+// 配置类
+class ConfigManager {
+ /**
+ * 初始化并加载配置
+ * 在应用启动时调用
+ */
+ static init() {
+ return this.loadConfig();
+ }
+
+ /**
+ * 加载配置数据
+ * @returns {Promise} 返回加载完成的Promise
+ */
+ static loadConfig() {
+ // 避免重复加载
+ if (isLoading) {
+ return loadPromise;
+ }
+
+ isLoading = true;
+ loadPromise = new Promise(async (resolve, reject) => {
+ const res = await RequestManager.request({
+ url: 'config',
+ method: "GET",
+ data: {},
+ Loading: isLoading
+ });
+ console.log(res);
+
+ if (res.status === 1 && res.data) {
+ configData = res.data;
+ uni.setStorageSync("configData", configData);
+ console.log('全局配置数据加载成功');
+ resolve(configData);
+ } else {
+ console.error('加载配置数据失败:', res.msg || '未知错误');
+ reject(new Error(res.msg || '加载配置失败'));
+ }
+
+ });
+
+ return loadPromise;
+ }
+
+ /**
+ * 获取所有配置数据
+ * @returns {Object} 配置数据对象
+ */
+ static getAll() {
+ if (configData) {
+ return configData;
+ } else {
+ console.warn('配置数据尚未加载,获取本地缓存中。。。');
+ configData = uni.getStorageSync("configData");
+ if (configData != null) {
+ return configData;
+ }
+ this.loadConfig();
+ return {};
+ }
+ }
+
+ /**
+ * 获取指定键的配置值
+ * @param {String} key 配置键
+ * @param {any} defaultValue 默认值,当键不存在时返回
+ * @returns {any} 配置值
+ */
+ static get(key, defaultValue = null) {
+ if (!configData) {
+ console.warn('配置数据尚未加载,获取本地缓存中。。。');
+ configData = uni.getStorageSync("configData");
+ if (configData != null) {
+ return configData;
+ }
+ this.loadConfig();
+ return defaultValue;
+ }
+
+ return key in configData ? configData[key] : defaultValue;
+ }
+
+ /**
+ * 刷新配置数据
+ * @returns {Promise} 返回刷新完成的Promise
+ */
+ static refresh() {
+ isLoading = false;
+ return this.loadConfig();
+ }
+
+ /**
+ * 检查配置是否已加载
+ * @returns {Boolean} 是否已加载
+ */
+ static isLoaded() {
+ return configData !== null;
+ }
+
+ /**
+ * 获取应用设置
+ * @param {String} key 设置键
+ * @returns {Object|String|null} 设置值
+ */
+ static getAppSetting(key = null) {
+ let appSetting = this.get('app_setting');
+ if (key == null) {
+ return appSetting;
+ }
+ return key in appSetting ? appSetting[key] : null;
+ }
+
+ /**
+ * 盒子类型
+ * @returns {Object} 商品类型对象
+ */
+ static getGoodType() {
+ let goodType = this.get('good_type');
+ if (goodType != null) {
+ return goodType.map(item => {
+ return {
+ id: item.value,
+ title: item.name
+ }
+ });
+ }
+ return [];
+ }
+
+ /**
+ * 获取指定键的配置值
+ * @param {String} key 配置键
+ * @param {any} defaultValue 默认值,当键不存在时返回
+ * @returns {any} 配置值
+ */
+ static async getAsync(key, defaultValue = null) {
+ if (!configData) {
+ // console.warn('配置数据尚未加载,正在加载中...');
+ await this.loadConfig();
+ if (configData) {
+ return key in configData ? configData[key] : defaultValue;;
+ }
+ return defaultValue;
+ }
+
+ return key in configData ? configData[key] : defaultValue;
+ }
+
+
+ /**
+ * 获取应用设置
+ * @param {String} key 设置键
+ * @returns {Object|String|null} 设置值
+ */
+ static async getAppSettingAsync(key = null) {
+ let appSetting = await this.getAsync('app_setting');
+ if (key == null) {
+ return appSetting;
+ }
+ return key in appSetting ? appSetting[key] : null;
+ }
+
+}
+
+export default ConfigManager;
\ No newline at end of file
diff --git a/common/request.js b/common/request.js
new file mode 100644
index 0000000..63433dd
--- /dev/null
+++ b/common/request.js
@@ -0,0 +1,234 @@
+/**
+ * 网络请求工具类
+ * 封装统一的网络请求方法
+ */
+
+class RequestManager {
+ /**
+ * 发送网络请求
+ * @param {Object} param 请求参数
+ * @param {String} param.url 请求地址
+ * @param {Object} param.data 请求数据
+ * @param {Function} param.success 成功回调
+ * @param {Function} param.fail 失败回调
+ * @param {Function} param.complete 完成回调
+ * @param {Boolean} param.Loading 是否显示加载提示
+ * @param {String} backpage 返回页面
+ * @param {String} backtype 返回类型
+ * @returns {Promise} 返回请求Promise
+ */
+ static request(param, backpage, backtype) {
+ return new Promise((resolve, reject) => {
+ // 参数检查
+ if (!param || typeof param !== 'object') {
+ reject(new Error('请求参数错误'))
+ return
+ }
+
+ uni.getNetworkType({
+ success: function(res) {
+ if (res.networkType == 'none') {
+ uni.showToast({
+ title: '网络连接异常,请检查网络',
+ icon: 'none'
+ })
+ reject(new Error('网络连接异常'))
+ return
+ }
+ }
+ })
+
+ const url = param.url || ''
+ const method = param.method || 'POST'
+ const data = param.data || {}
+ const Loading = param.Loading || false
+ const token = uni.getStorageSync('token')
+ let client = ""
+
+ // #ifdef H5
+ client = "h5"
+ // #endif
+
+ // 获取应用实例和基础URL
+ const app = getApp()
+ let siteBaseUrl = ''
+
+ if (app && app.globalData && app.globalData.siteBaseUrl) {
+ siteBaseUrl = app.globalData.siteBaseUrl
+ } else {
+ // 尝试从Vue原型获取
+ try {
+ const Vue = require('vue').default
+ if (Vue.prototype && Vue.prototype.siteBaseUrl) {
+ siteBaseUrl = Vue.prototype.siteBaseUrl
+ }
+ } catch (e) {
+ console.error('获取siteBaseUrl失败', e)
+ }
+
+ if (!siteBaseUrl) {
+ // 兜底处理
+ siteBaseUrl = 'https://manghe.zpc-xy.com/api/'
+ }
+ }
+
+ // 拼接完整请求地址,确保URL格式正确
+ let requestUrl = ''
+
+ if (url.startsWith('http://') || url.startsWith('https://')) {
+ // 如果是完整的URL,直接使用
+ requestUrl = url
+ } else {
+ // 否则拼接基础URL和相对路径
+ // 确保基础URL以/结尾,而请求路径不以/开头
+ const baseUrlWithSlash = siteBaseUrl.endsWith('/') ? siteBaseUrl : siteBaseUrl + '/'
+ const path = url.startsWith('/') ? url.substring(1) : url
+ requestUrl = baseUrlWithSlash + path
+ }
+
+ console.log('请求URL:', requestUrl)
+
+ let header = {}
+
+ if (method.toUpperCase() == 'POST') {
+ header = {
+ 'content-type': 'application/x-www-form-urlencoded',
+ client: client,
+ token: token,
+ adid: uni.getStorageSync('_ad_id'),
+ clickid: uni.getStorageSync('_click_id')
+ }
+ } else {
+ header = {
+ 'content-type': 'application/json'
+ }
+ }
+
+ // 显示加载提示
+ if (!Loading) {
+ uni.showLoading({
+ title: '加载中...'
+ })
+ }
+
+ // 发起网络请求
+ uni.request({
+ url: requestUrl,
+ method: method.toUpperCase(),
+ header: header,
+ data: data,
+ success: res => {
+ console.log("res.data.status", res.data.status)
+ if (res.data.status == 1) {
+ // 请求成功
+ resolve(res.data)
+ } else if (res.data.status == 2222) {
+ // 特殊状态码处理
+ resolve(res.data)
+ } else if (res.data.status == -9) {
+ let pages = getCurrentPages()
+ console.log(pages[pages.length - 1].route)
+ setTimeout(() => {
+ uni.showToast({
+ title: res.data.msg,
+ icon: 'none',
+ success() {
+ setTimeout(() => {
+ // #ifdef H5
+ uni.navigateTo({
+ url: '/pages/user/bangdingweb'
+ })
+ // #endif
+ // #ifdef MP-WEIXIN
+ uni.navigateTo({
+ url: '/pages/user/bangding'
+ })
+ // #endif
+ }, 1500)
+ }
+ })
+ }, 100)
+ reject(res.data)
+ } else if (res.data.status == 0) {
+ setTimeout(function() {
+ uni.showToast({
+ title: res.data.msg,
+ icon: 'none'
+ })
+ }, 100)
+ reject(res.data)
+ } else if (res.data.status < 0) {
+ var pages = getCurrentPages()
+ for (var a = 0; a < pages.length; a++) {
+ console.log(pages[a].route)
+ if (pages[a].route == 'pages/user/index') {
+ uni.setStorageSync('lgurl', pages[a].route)
+ uni.setStorageSync('lgurldata', JSON.stringify(pages[a].options))
+ }
+ }
+ setTimeout(() => {
+ uni.showToast({
+ title: '请先登录',
+ icon: 'none'
+ })
+ }, 100)
+ uni.redirectTo({
+ url: '/pages/user/login'
+ })
+ reject(res.data)
+ } else {
+ reject(res.data)
+ }
+ typeof param.success == 'function' && param.success(res.data)
+ },
+ fail: e => {
+ console.error('网络请求失败:', e)
+ uni.showToast({
+ title: e.errMsg || '请求失败',
+ icon: 'none'
+ })
+ typeof param.fail == 'function' && param.fail(e)
+ reject(e)
+ },
+ complete: () => {
+ uni.hideLoading()
+ typeof param.complete == 'function' && param.complete()
+ }
+ })
+ })
+ }
+
+ /**
+ * 发送GET请求
+ * @param {String} url 请求地址
+ * @param {Object} data 请求参数
+ * @param {Boolean} showLoading 是否显示加载提示
+ * @returns {Promise} 返回请求Promise
+ */
+ static get(url, data = {}, showLoading = true) {
+ return this.request({
+ url,
+ data,
+ method: 'GET',
+ Loading: !showLoading
+ })
+ }
+
+ /**
+ * 发送POST请求
+ * @param {String} url 请求地址
+ * @param {Object} data 请求参数
+ * @param {Boolean} showLoading 是否显示加载提示
+ * @returns {Promise} 返回请求Promise
+ */
+ static post(url, data = {}, showLoading = true) {
+ return this.request({
+ url,
+ data,
+ method: 'POST',
+ Loading: !showLoading
+ })
+ }
+}
+
+export default RequestManager;
\ No newline at end of file
diff --git a/components/priv-pop/priv-pop.vue b/components/priv-pop/priv-pop.vue
index 71206bd..5cf0706 100644
--- a/components/priv-pop/priv-pop.vue
+++ b/components/priv-pop/priv-pop.vue
@@ -11,7 +11,7 @@
感谢选择我们的产品,我们非常重视您的个人信息安全和隐私保护.根据最新法律要求,使用我们的产品前,请仔细阅读
- 《吧唧一番赏隐私保护指引》
+ 《{{ $config.getAppSetting("app_name") }}隐私保护指引》
,以便我们向您提供更优质的服务!
diff --git a/main.js b/main.js
index 2160d77..920ca68 100644
--- a/main.js
+++ b/main.js
@@ -1,201 +1,53 @@
import Vue from 'vue'
import App from './App'
import Mixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js'
-// import uView from "uview-ui"
-
-import {
- gotopage
-} from '@/common/gotopage.js'
-// 配置公共方法
-Vue.prototype.gotoPage = gotopage
-
-// Vue.use(uView);
-// 配置公共方法
import common from '@/common/common.js'
+import { gotopage } from '@/common/gotopage.js'
+import RequestManager from '@/common/request.js'
+import ConfigManager from '@/common/config.js'
+
+
+// 基础配置
+const baseUrl = 'https://manghe.zpc-xy.com'
+const imageUrl = 'https://mh.shhuanmeng.com'
+const loginPage = "https://xinglanmh.shequtuangou.vip/login.html"
+
+// 全局变量配置
+Vue.prototype.siteBaseUrl = baseUrl + '/api/'
+Vue.prototype.$baseUrl = baseUrl
+Vue.prototype.$z_img2 = imageUrl + '/zcq/'
+Vue.prototype.$img = url => imageUrl + '/static/web' + url
+Vue.prototype.$img1 = url => imageUrl + '/static/web/static/' + url
+Vue.prototype.$sys = () => uni.getSystemInfoSync()
+Vue.prototype.$loginPage = loginPage
+Vue.prototype.$wxloginPage = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx0e33d80d35e4a3b1&redirect_uri=${escape(loginPage)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+
+// 公共方法
+Vue.prototype.gotoPage = gotopage
Vue.prototype.$noMultipleClicks = common.noMultipleClicks
-Vue.prototype.$c = common;
-//var loginPage = "http://api.zpc-xy.com/login.html";
-// var loginPage="http://api.zpc-xy.com/login.html";
-var loginPage = "https://xinglanmh.shequtuangou.vip/login.html";
-Vue.prototype.$loginPage = loginPage;
-Vue.prototype.$wxloginPage =
- `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx0e33d80d35e4a3b1&redirect_uri=${escape(loginPage)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`;
-//ttps://open.weixin.qq.com/connect/qrconnect?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect
-// https://open.weixin.qq.com/connect/oauth2/authorize? =wx520c15f417810387&redirect_uri=https%3A%2F%2Fchong.qq.com%2Fphp%2Findex.php%3Fd%3D%26c%3DwxAdapter%26m%3DmobileDeal%26showwxpaytitle%3D1%26vb2ctag%3D4_2030_5_1194_60&response_type=code&scope=snsapi_base&state=123#wechat_redirect
-Vue.prototype.req = function(param, backpage, backtype) {
- uni.getNetworkType({
- success: function(res) {
- if (res.networkType == 'none') {
- uni.showToast({
- title: '网络连接异常,请检查网络',
- icon: 'none'
- })
- return
- }
- }
- })
- var _self = this,
- url = param.url,
- method = 'POST',
- header = {},
- data = param.data || {},
- Loading = param.Loading || false
+Vue.prototype.$c = common
- var token = uni.getStorageSync('token')
- // 我
- // var token = 'bf3dd927642ea5a7a9ad90f1e1d1faab4d61cd33';
- // 客户
- // var token = '801abe6ec37a36b3ff37ded44be13c7bf06b629e';
- var client = "";
- // #ifdef H5
- client = "h5";
- // #endif
- //拼接完整请求地址
- var requestUrl = this.siteBaseUrl + url
- if (method) {
- method = method.toUpperCase() //小写改为大写
- // console.log(token,11)
- if (method == 'POST') {
- header = {
- 'content-type': 'application/x-www-form-urlencoded',
- client: client,
- token: token,
- adid: uni.getStorageSync('_ad_id'),
- clickid: uni.getStorageSync('_click_id'),
+// 全局请求方法
+Vue.prototype.req = RequestManager.request
+Vue.prototype.$request = RequestManager
- }
-
- // if (uni.getStorageSync('_ad_id')) {
- // header.adid = uni.getStorageSync('_ad_id')
- // }
- // if (uni.getStorageSync('_click_id')) {
- // header.clickid = uni.getStorageSync('_click_id')
- // }
- } else {
- header = {
- 'content-type': 'application/json'
- }
- }
- } else {
- method = 'GET'
- header = {
- 'content-type': 'application/json'
- }
- }
- //用户交互:加载圈
- // console.log(!Loading)
- if (!Loading) {
- uni.showLoading({
- title: '加载中...'
- })
- }
- //网络请求
-
- uni.request({
- url: requestUrl,
- method: method,
- header: header,
- data: data,
- success: res => {
- // if (requestUrl.indexOf('coupon_ling') != -1) {
- // uni.showModal({
- // title: '提示',
- // content: JSON.stringify(res),
- // showCancel: true,
- // success: ({ confirm, cancel }) => {}
- // })
- // }
-
- console.log("res.data.status", res.data.status)
- if (res.data.status == 1) {
- //返回结果码code判断:1成功,-1错误
- // uni.showToast({
- // title: res.data.msg,
- // icon: 'none',
- // })
- } else if (res.data.status == 2222) {} else if (res.data.status == -9) {
- let pages = getCurrentPages()
- console.log(pages[pages.length - 1].route)
- // uni.setStorageSync('page', pages[pages.length - 1].route)
- setTimeout(() => {
- uni.showToast({
- title: res.data.msg,
- icon: 'none',
- success() {
- setTimeout(() => {
- // #ifdef H5
- uni.navigateTo({
- url: '/pages/user/bangdingweb'
- })
- // #endif
- // #ifdef MP-WEIXIN
- uni.navigateTo({
- url: '/pages/user/bangding'
- })
- // #endif
-
- }, 1500)
- }
- })
- }, 100)
- } else if (res.data.status == 0) {
- setTimeout(function() {
- uni.showToast({
- title: res.data.msg,
- icon: 'none'
- })
- }, 100)
- } else if (res.data.status < 0) {
- var pages = getCurrentPages()
- for (var a = 0; a < pages.length; a++) {
- console.log(pages[a].route)
- if (pages[a].route == 'pages/user/index') {
- uni.setStorageSync('lgurl', pages[a].route)
- uni.setStorageSync('lgurldata', JSON.stringify(pages[a].options))
- }
- }
- setTimeout(() => {
- uni.showToast({
- title: '请先登录',
- icon: 'none'
- })
- }, 100)
- uni.redirectTo({
- url: '/pages/user/login'
- })
- } else {
- return
- }
- typeof param.success == 'function' && param.success(res.data)
- },
- fail: e => {
- console.log('网络请求fail:' + JSON.stringify(e))
- typeof param.fail == 'function' && param.fail(e.data)
- },
- complete: () => {
- uni.hideLoading()
- typeof param.complete == 'function' && param.complete()
- return
- }
- })
-}
+// 全局配置管理器
+Vue.prototype.$config = ConfigManager
// #ifdef H5
function loadScript(url) {
- var script = document.createElement('script');
- script.type = 'text/javascript';
- script.src = url;
- document.head.appendChild(script);
+ var script = document.createElement('script')
+ script.type = 'text/javascript'
+ script.src = url
+ document.head.appendChild(script)
}
-loadScript('https://res.wx.qq.com/open/js/jweixin-1.6.0.js');
+loadScript('https://res.wx.qq.com/open/js/jweixin-1.6.0.js')
// #endif
// #ifdef MP-WEIXIN
const updateManager = wx.getUpdateManager()
-console.log(updateManager);
updateManager.onCheckForUpdate(function(res) {
- // 请求完新版本信息的回调
console.log(res.hasUpdate)
})
@@ -205,7 +57,6 @@ updateManager.onUpdateReady(function() {
content: '新版本已经准备好,是否重启应用?',
success(res) {
if (res.confirm) {
- // 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate()
}
}
@@ -217,23 +68,6 @@ updateManager.onUpdateFailed(function() {
})
// #endif
-// 测试
-
-const baseUrl = 'https://manghe.zpc-xy.com'
-const imageUrl = 'https://mh.shhuanmeng.com';
-// 正式
-// const baseUrl = 'https://bajiapi.onelight.vip'
-Vue.prototype.siteBaseUrl = baseUrl + '/api/'
-
-Vue.prototype.$z_img2 = imageUrl + '/zcq/'
-Vue.prototype.$baseUrl = baseUrl
-// Vue.prototype.$img = url => baseUrl + '/static/web' + url
-Vue.prototype.$img = url => imageUrl + '/static/web' + url
-// Vue.prototype.$img1 = url => baseUrl + '/static/web' + url
-Vue.prototype.$img1 = url => imageUrl + '/static/web/static/' + url
-
-Vue.prototype.$sys = () => uni.getSystemInfoSync()
-
Vue.config.productionTip = false
Vue.mixin(Mixin)
App.mpType = 'app'
@@ -241,4 +75,17 @@ App.mpType = 'app'
const app = new Vue({
...App
})
+
+// 创建全局数据对象
+app.globalData = {
+ siteBaseUrl: baseUrl + '/api/'
+}
+
+// 应用启动时加载全局配置
+ConfigManager.init().then(config => {
+ console.log('全局配置加载完成')
+}).catch(err => {
+ console.error('全局配置加载失败', err)
+})
+
app.$mount()
\ No newline at end of file
diff --git a/package/index/leitai.vue b/package/index/leitai.vue
index 281b398..2972fe5 100644
--- a/package/index/leitai.vue
+++ b/package/index/leitai.vue
@@ -4,292 +4,359 @@
* @Description: content
-->
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
- {{ item.shang_info.title }}
- {{ item.surplus_stock }}/{{ item.stock }}
- 预售
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+ {{ item.shang_info.title }}
+ {{ item.surplus_stock }}/{{ item.stock }}
+ 预售
-
-
-
-
+
+
+
+
-
- {{ item.title }}
-
-
- 售价:¥{{ item.sc_money }}
-
- {{ item.pro }}
+
+ {{ item.title }}
+
+
+ 售价:¥{{ item.sc_money }}
+
+ {{ item.pro }}
+
+
+
+
+
+
+ {{
+ i.shang_info.title
+ }}
+
+ {{ i.surplus_stock }}/{{ i.stock }}
+ {{ i.title }}
+
+ {{ i.pro }}
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+
+
-
-
-
-
-
-
- {{i.shang_info.title}}
-
- {{i.surplus_stock}}/{{i.stock}}
- {{i.title}}
-
- {{i.pro}}
-
-
-
-
-
-
-
- {{ item.shang_title }}
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+ {{ item.user_info.nickname }}
+
+ {{ item.addtime }}
+
-
-
- {{ item.user_info.nickname }}
-
- {{ item.addtime }}
-
+
+
+
+
+
+ {{ item.shang_title }}
+
+
+ {{ item.goodslist_title }}
+
+ ×1
+
+
+
+
+
+
+
-
-
-
-
-
- {{item.shang_title}}
-
-
- {{ item.goodslist_title }}
-
- ×1
-
-
-
-
-
-
-
+
+
+ 抽1发
+
+
-
-
- 抽1发
-
+
+
+
+
+ {{ previewData.shang_info.title }}
+
-
+
+
+ {{ previewData.title }}
+
+
-
-
-
-
- {{previewData.shang_info.title}}
-
+
+
+ {{ previewData.shang_info.title }} {{ previewData.pro }}
+
-
-
- {{ previewData.title }}
-
-
+ 产品类型:{{ optData.type_text }}
+
-
-
- {{ previewData.shang_info.title }} {{ previewData.pro }}
-
+
+
+
+
+
- 产品类型:{{ optData.type_text }}
-
+
+
+
+ 确认订单
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
- 确认订单
-
-
-
-
+
+
+ {{ orderData.goods.title }}
+
-
-
-
-
-
+ 类型:明信片
-
-
- {{ orderData.goods.title }}
-
+
+
+
+ ¥
+ {{ orderData.goods.shou_zhe_price }}
+ 积分
+ (首抽5折)
+
- 类型:明信片
+ ×{{ 1 }}
+
-
-
-
- ¥
- {{ orderData.goods.shou_zhe_price }}
- 积分
- (首抽5折)
-
+
+
+ ¥
+ {{ orderData.goods.price }}
+ 积分
+
- ×{{ 1 }}
-
+
+ ×{{ orderData.goods.prize_num * 1 - 1 }}
+
+
+
-
-
- ¥
- {{ orderData.goods.price }}
- 积分
-
+
+
+ ¥
+ {{ orderData.goods.price }}
+ 积分
+
-
- ×{{ orderData.goods.prize_num * 1 - 1 }}
-
-
-
+ ×{{ orderData.goods.prize_num }}
+
+
+
-
-
- ¥
- {{ orderData.goods.price }}
- 积分
-
+
- ×{{ orderData.goods.prize_num }}
-
-
-
+
+
+ 优惠券
-
+
+ {{
+ couponData && orderData.coupon_price > 0
+ ? `-${couponData.price}`
+ : "未选择"
+ }}
-
-
- 优惠券
+
+
+
+
+
+
+
+ {{
+ orderData.zhe
+ ? `会员折扣 (${orderData.zhe}折)`
+ : "暂无会员抵扣"
+ }}
+
+
+ 详情
+
+
+
+
+
+
+
-
- {{
- couponData && orderData.coupon_price > 0
- ? `-${couponData.price}`
- : '未选择'
- }}
+ 请选择抵扣方式
-
-
-
-
-
-
-
- {{
- orderData.zhe
- ? `会员折扣 (${orderData.zhe}折)`
- : '暂无会员抵扣'
- }}
-
-
- 详情
-
-
-
-
-
-
-
+
+
+ 使用积分抵扣
+ {{ orderData.use_score }} (剩余:{{ orderData.score }})
+
- 请选择抵扣方式
+
+
-
-
- 使用积分抵扣
- {{ orderData.use_score }} (剩余:{{ orderData.score }})
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- 使用星钻抵扣¥
- {{ orderData.use_money }} (剩余:{{ orderData.money }})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 使用星钻抵扣¥
+ {{ orderData.use_money }} (剩余:{{ orderData.money }})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
- 我已满18岁,阅读并同意
+ 我已满18岁,阅读并同意
-
- 《用户协议》
-
+
+ 《用户协议》
+
-
- 《隐私政策》
-
-
+
+ 《隐私政策》
+
+
-
- 确认支付
- {{
- pageData.goods.type == 5
- ? ` ${orderData.use_score}积分`
- : ` ¥${orderData.price}`
- }}
-
-
-
+
+ 确认支付
+ {{
+ pageData.goods.type == 5
+ ? ` ${orderData.use_score}积分`
+ : ` ¥${orderData.price}`
+ }}
+
+
+
-
+
-
-
-
-
-
-
-
-
- {{ item.shang_title }}
- ×{{ item.prize_num }}
-
-
- {{ item.goodslist_title }}
-
-
- {{
- item.goodslist_money * 1 > 0
- ? `可兑换:${item.goodslist_money}`
- : `不可兑换`
- }}
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+ ×{{ item.prize_num }}
+
+
+ {{ item.goodslist_title }}
+
+
+ {{
+ item.goodslist_money * 1 > 0
+ ? `可兑换:${item.goodslist_money}`
+ : `不可兑换`
+ }}
+
+
+
+
-
-
- 去盒柜
-
+
+
+ 去盒柜
+
-
- 继续抽
-
-
-
-
+
+ 继续抽
+
+
+
+
-
-
-
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/package/index/lian-ji.vue b/package/index/lian-ji.vue
index a2370ac..d630918 100644
--- a/package/index/lian-ji.vue
+++ b/package/index/lian-ji.vue
@@ -523,8 +523,9 @@
return co;
}
}
+
return {
- title: `吧唧一番赏${this.pageData.goods.title}系列`,
+ title: this.$config.getAppSetting("app_name")+`${this.pageData.goods.title}系列`,
imageUrl: this.pageData.goods.imgurl_detail,
path: '/package/index/lian-ji' +
this.$c.qs({
diff --git a/pages.json b/pages.json
index a10fafc..5fb6d4e 100644
--- a/pages.json
+++ b/pages.json
@@ -60,7 +60,7 @@
{
"path": "pages/user/login",
"style": {
- "navigationBarTitleText": "吧唧一番赏",
+ "navigationBarTitleText": "友达赏",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
}
@@ -68,7 +68,7 @@
{
"path": "pages/user/bangding",
"style": {
- "navigationBarTitleText": "吧唧一番赏",
+ "navigationBarTitleText": "友达赏",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
}
@@ -499,7 +499,7 @@
],
"globalStyle": {
"navigationBarTextStyle": "white",
- "navigationBarTitleText": "吧唧一番赏",
+ "navigationBarTitleText": "友达赏",
"navigationBarBackgroundColor": "#222222",
"backgroundColor": "#000000"
},
diff --git a/pages/DrawCard/cardDetail.vue b/pages/DrawCard/cardDetail.vue
index c539427..ff9ede3 100644
--- a/pages/DrawCard/cardDetail.vue
+++ b/pages/DrawCard/cardDetail.vue
@@ -1,963 +1,1147 @@
-
-
-
-
-
-
- {{detailInfo.title}} ¥{{detailInfo.show_price}}
- {{detailInfo.card_notice}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 必出{{detailInfo.card_set.center_shang_name}}
- 必出{{detailInfo.card_set.right_shang_name}}
-
-
-
-
-
-
- ×
-
-
-
-
- {{detailInfo.title}}
- 类型:1包
-
- 单价:{{detailInfo.price}}元
- ×{{pay_news.goods.first_num}}
-
-
-
-
- 数量:{{pay_news.goods.prize_num}}张
-
- 小计:{{goods.box_type==5?'':'¥'}}{{pay_news.order_total}}{{goods.box_type==5?'积分':''}}
-
-
-
-
- 支付方式
-
-
-
-
-
-
- 使用星钻抵扣¥{{pay_news.use_integral}}(剩余:{{pay_news.integral}})
-
-
-
-
-
-
-
-
- 使用星钻抵扣¥{{pay_news.use_money}}(剩余:{{pay_news.money}})
-
-
-
-
-
-
-
-
- 下单购买即表示同意
- 《用户服务协议条款》
-
-
-
- 总计:¥{{pay_news.order_total}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{v.goodslist_title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ×
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
- {{item.user_info.nickname}}
-
-
- {{item.addtime}}
-
-
-
-
- {{item.goodslist_title}}
-
- X{{item.prize_num}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ detailInfo.title }} ¥{{ detailInfo.show_price }}
+ {{ detailInfo.card_notice }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 必出{{ detailInfo.card_set.center_shang_name }}
+ 必出{{ detailInfo.card_set.right_shang_name }}
+
+
+
+
+
+
+ ×
+
+
+
+
+ {{ detailInfo.title }}
+ 类型:1包
+
+ 单价:{{ detailInfo.price }}元
+ ×{{ pay_news.goods.first_num }}
+
+
+
+
+ 数量:{{ pay_news.goods.prize_num }}张
+
+ 小计:{{ goods.box_type == 5 ? "" : "¥"
+ }}{{ pay_news.order_total
+ }}{{ goods.box_type == 5 ? "积分" : "" }}
+
+
+
+
+ 支付方式
+
+
+
+
+
+
+ 使用星钻抵扣¥{{ pay_news.use_integral }}(剩余:{{ pay_news.integral }})
+
+
+
+
+
+
+
+
+ 使用星钻抵扣¥{{ pay_news.use_money }}(剩余:{{ pay_news.money }})
+
+
+
+
+
+
+
+ 下单购买即表示同意
+ 《用户服务协议条款》
+
+
+
+ 总计:¥{{
+ pay_news.order_total
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ v.goodslist_title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ×
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+ {{ item.user_info.nickname }}
+
+
+ {{ item.addtime }}
+
+
+
+
+ {{
+ item.goodslist_title
+ }}
+
+ X{{ item.prize_num }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/DrawCard/index.vue b/pages/DrawCard/index.vue
index 4abee81..8310ccf 100644
--- a/pages/DrawCard/index.vue
+++ b/pages/DrawCard/index.vue
@@ -3,7 +3,7 @@
- 吧唧一番赏
+ 友达赏
diff --git a/pages/chouka/ka.vue b/pages/chouka/ka.vue
index 5279d64..3813337 100644
--- a/pages/chouka/ka.vue
+++ b/pages/chouka/ka.vue
@@ -286,8 +286,9 @@
},
onShareAppMessage() {
let that = this;
+
return {
- title: "吧唧一番赏" + that.goods.title + '系列',
+ title: that.$config.getAppSetting("app_name")+ that.goods.title + '系列',
imageUrl: that.goods.card_banner,
path: "/pages/chouka/ka?goods_id=" + that.goods_id + '&pid=' + uni.getStorageSync('userinfo').ID
};
diff --git a/pages/fuli/fuli-detail.vue b/pages/fuli/fuli-detail.vue
index 65f9d8d..3bbcd79 100644
--- a/pages/fuli/fuli-detail.vue
+++ b/pages/fuli/fuli-detail.vue
@@ -513,7 +513,7 @@
onShareAppMessage(e) {
let that = this
return {
- title: '吧唧一番赏' + that.goods.title + '系列',
+ title: this.$config.getAppSetting("app_name")+ that.goods.title + '系列',
imageUrl: that.goods.imgurl_detail,
path: '/pages/shouye/detail_wuxian?goods_id=' +
that.goods_id +
diff --git a/pages/shouye/detail copy.vue b/pages/shouye/detail copy.vue
index 8d3e2f9..2700ba4 100644
--- a/pages/shouye/detail copy.vue
+++ b/pages/shouye/detail copy.vue
@@ -871,7 +871,7 @@
产品类型:
- 一番赏
+ {{ $config.getAppSetting("app_name")}}
@@ -1190,9 +1190,10 @@ export default {
onShareAppMessage() {
let that = this
+
return {
title:
- '吧唧一番赏' +
+ this.$config.getAppSetting("app_name") +
that.goods.title +
'系列' +
' 第' +
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index 35d969d..cb5b10f 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -594,7 +594,7 @@
}
}
return {
- title: `吧唧一番赏${this.pageData.goods.title}系列 第${this.pageData.goods.num}套`,
+ title: this.$config.getAppSetting("app_name")+`${this.pageData.goods.title}系列 第${this.pageData.goods.num}套`,
imageUrl: this.pageData.goods.imgurl_detail,
path: '/pages/shouye/detail' +
this.$c.qs({
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index 41b7b74..ff5d802 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -649,7 +649,7 @@
}
return {
- title: `吧唧一番赏${this.pageData.goods.title}系列`,
+ title: this.$config.getAppSetting("app_name")+`${this.pageData.goods.title}系列`,
imageUrl: this.pageData.goods.imgurl_detail,
path: '/pages/shouye/detail_wuxian' +
this.$c.qs({
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index ba0600c..83c1905 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -4,15 +4,19 @@
* @Description: content
-->
-
-
-
-
-
- 吧唧一番赏
-
-
-
+
+ {{ $config.getAppSetting("app_name") }}
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
+
+
- 今日推荐
-
-
-
-
-
-
-
-
+
+
-
-
-
- {{ item.title }}
-
-
+
+
+ {{ item.title }}
+
+
-
-
-
-
-
-
-
- {{ item.title }}
-
- {{ item.join_count }}次参与
-
- 快去参与吧!
-
-
- ¥{{ item.price }}
-
-
- {{ item.sale_stock }}/{{ item.stock }}
-
-
-
-
-
-
-
-
- {{ item.type_text }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加客服领优惠
- 识别图中二维码
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 添加客服领优惠
+ 识别图中二维码
+
+
+
+
+
+
+
-
-
-
-
- 新人大礼包
-
-
-
-
- ¥
- {{Number(item.price)}}
-
-
- {{item.title}}
- 有限期{{item.effective_day}}天
-
-
-
- 立即收下
- 优惠券在【我的-优惠券】中查看
-
-
-
-
-
-
+
+
+
+
+ 新人大礼包
+
+
+
+
+ ¥
+ {{ Number(item.price) }}
+
+
+ {{ item.title }}
+ 有限期{{ item.effective_day }}天
+
+
+
+ 立即收下
+ 优惠券在【我的-优惠券】中查看
+
+
+
+
+
+
-
-
+
-
-
+
-
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file