From b2ef575308abf3b38d40b0937ef2dc0a499689b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clinchaomei=E2=80=9D?= <2603772894@qq.com> Date: Mon, 19 Sep 2022 17:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 26 +- api/index.js | 13 + api/request.js | 14 +- common/common.scss | 85 ++++- common/scss/order.scss | 2 +- config.js | 3 +- js_sdk/mmmm-image-tools/index.js | 196 ++++++++++ js_sdk/mmmm-image-tools/package.json | 11 + manifest.json | 21 +- pages.json | 82 ++-- pages/account/addAddress.vue | 14 +- pages/account/address.vue | 2 +- pages/account/demo1.vue | 387 +++++++++++++++++++ pages/account/favorites.vue | 7 +- pages/account/index.vue | 18 +- pages/account/message.vue | 6 +- pages/account/myCoupons.vue | 22 +- pages/account/myOrders.vue | 2 +- pages/account/pointsDetails.vue | 26 +- pages/account/wishlist.vue | 8 +- pages/category/index.vue | 4 +- pages/category/productList.vue | 183 ++++++--- pages/index/first.vue | 192 ++++++++++ pages/index/flashSale.vue | 79 +++- pages/index/index.vue | 543 +++++++++++++++++---------- pages/index/index2.vue | 14 +- pages/index/pickUpCentre.vue | 51 ++- pages/index/search.vue | 5 + pages/login/index.vue | 19 +- pages/order/confirmation.vue | 5 +- pages/order/details.vue | 2 +- pages/order/logisticsDetails.vue | 24 +- pages/productDetails/goodsReview.vue | 37 +- pages/productDetails/index.vue | 244 +++++++----- pages/productDetails/review.vue | 96 ++++- pages/shippingCart/index.vue | 97 +++-- pages/specialTitle/index.vue | 9 +- static/icon/cat_white.png | Bin 0 -> 2599 bytes static/icon/like_red.png | Bin 0 -> 2838 bytes static/icon/right_white.png | Bin 0 -> 3866 bytes static/icon/share_white.png | Bin 0 -> 2343 bytes static/img/bottom1_white.png | Bin 0 -> 556 bytes static/img/delete_white.png | Bin 0 -> 1481 bytes static/img/pets_nav_white.png | Bin 0 -> 977 bytes static/img/ptes_nav1_white.png | Bin 0 -> 2517 bytes static/img/top_white.png | Bin 0 -> 463 bytes 46 files changed, 2008 insertions(+), 541 deletions(-) create mode 100644 js_sdk/mmmm-image-tools/index.js create mode 100644 js_sdk/mmmm-image-tools/package.json create mode 100644 pages/index/first.vue create mode 100644 static/icon/cat_white.png create mode 100644 static/icon/like_red.png create mode 100644 static/icon/right_white.png create mode 100644 static/icon/share_white.png create mode 100644 static/img/bottom1_white.png create mode 100644 static/img/delete_white.png create mode 100644 static/img/pets_nav_white.png create mode 100644 static/img/ptes_nav1_white.png create mode 100644 static/img/top_white.png diff --git a/App.vue b/App.vue index d6a2142..4e0f5a6 100644 --- a/App.vue +++ b/App.vue @@ -8,14 +8,9 @@ }, onLaunch: function() { // console.log('App Launch') - uni.onTabBarMidButtonTap(()=>{ - uni.showTabBar() - uni.navigateTo({ - url:'/pages/index/index2' - }) - - - }) + setTimeout(() => { + plus.navigator.closeSplashscreen(); + }, 5000); }, onShow: function() { console.log('App Show') @@ -23,20 +18,7 @@ onHide: function() { // console.log('App Hide') }, - methods:{ - onBack() { - this.backButtonPress++; - if (this.backButtonPress > 1) { - plus.runtime.quit(); - } else { - plus.nativeUI.toast('Click again to exit'); - } - setTimeout(function() { - this.backButtonPress = 0; - }, 1000); - return true; - }, - } + } diff --git a/api/index.js b/api/index.js index 2878f6b..3bad97b 100644 --- a/api/index.js +++ b/api/index.js @@ -61,4 +61,17 @@ export const defaultRequest4 =query=>{ isEncryption:false, isLoad:false }) +} +//上传图片 +export const defaultRequest5 =(query,img)=>{ + return httpRequest({ + url:'mapi/api_v2011.php?appcode=DOPE+', + method:'post', + data:query, + afile:img, + errMsg:true, + isCookies:false, + isEncryption:false, + isLoad:true + }) } \ No newline at end of file diff --git a/api/request.js b/api/request.js index 1de1724..c5a09e1 100644 --- a/api/request.js +++ b/api/request.js @@ -5,9 +5,9 @@ import cryptoJS from "crypto-js" const httpRequest = (params) => { if(params.isLoad){ - uni.showLoading({ - // title: "努力加载中..." - }); + // uni.showLoading({ + // title: "Loading..." + // }); } const json_data={ @@ -63,9 +63,13 @@ const httpRequest = (params) => { // console.info(res) uni.hideLoading(); // 进行解密 - res.data=JSON.parse(decryptDes(res.data,'6780f04cf2e211ec86a8005056c00008')) + // let list = res.data + // res.data=JSON.parse(decryptDes(res.data,"6780f04cf2e211ec86a8005056c00008")) + res.data=JSON.parse(decryptDes(res.data,"6780f04cf2e211ec86a8005056c00008")) + // res.data=Base64.decode(decryptDes(res.data,'6780f04cf2e211ec86a8005056c00008')); - // console.info(res.data) + // console.info(list) + // res.data = list if(res.data.error!=0 && params.errMsg){ // uni.showToast({ // // title: res.data.message, diff --git a/common/common.scss b/common/common.scss index 85b39b0..1fb9daf 100644 --- a/common/common.scss +++ b/common/common.scss @@ -1,9 +1,13 @@ .status_bar { - height: var(--status-bar-height); + // height: var(--status-bar-height); width: 100%; + height: 50rpx; + // background-color: #000000; } - +.uni-bg-black{ + background-color: #000000; +} //地址信息 .address{ padding-top: 33.33rpx; @@ -60,24 +64,65 @@ // 评价 .reviews_item{ padding: 34rpx 0; - border-bottom: 1px solid #E2E2E2; + border-bottom: 0.1rpx solid #3b3b3b; + opacity: 0.7; &:last-child{ border-bottom: none; } .reviews_item_title{ display: flex; - align-items: center; - justify-content: space-between; + // align-items: center; + // justify-content: space-around; + .reviews_item_img{ + height: 100rpx; + width: 100rpx; + // border-radius: 50%; + // margin-right: 2rpx; + + image{ + height: 100%; + width: 100%; + border-radius: 50%; + } + } + .reviews_title_one{ + height: 100rpx; + width: 66vw; + } + .reviews_title_color{ + font-size: 28rpx; + color:#fff; + height: 50rpx; + line-height: 50rpx; + padding-left: 15.37rpx; + } .reviews_title_user{ font-size: 32rpx; - display: flex; - align-items: center; - color: #3D3D3D; + height:50rpx; + width: 50vw; + + // margin-left: 10rpx; + line-height: 50rpx; + text-align: center; + display: flex; + overflow: hidden; + align-items: start; + // color: #ccc; + // background-color: #4F92F1; + padding:0; text{ display: inline-block; margin-right: 2rpx; + text-align: center; + overflow: hidden; + } + .reviews_title_user_name{ + max-width: 300rpx; + overflow: hidden; + margin-left: 13.37rpx; + margin-right: 13.37rpx; } } @@ -85,6 +130,9 @@ font-size: 24rpx; font-weight: 400; color: #909090; + margin-top: 8rpx; + margin-left: 50rpx; + } } .reviews_item_color{ @@ -107,7 +155,12 @@ width: 233.33rpx; height: 233.33rpx; margin-left: 16.67rpx; - background-color: #999999; + // background-color: #999999; + background-size: 100% !important; + image{ + height: 100%; + width: 100%; + } &:first-child{ margin-left: 0; } @@ -125,6 +178,7 @@ .order_popup_title{ position: relative; + color:#000; font-size: 32rpx; font-weight: bold; border-bottom: 1px solid #E2E2E2; @@ -366,13 +420,18 @@ .recommend_content_item{ width: 340rpx; - margin-bottom: 46.67rpx; - + margin-bottom: 16.67rpx; + .recommend_content_name{ + height: 80rpx; + line-height: 40rpx; + overflow: hidden; + font-size: 25rpx; + } .recommend_content_item_image{ width: 100%; height:340rpx ; background-color: #999999; - margin-bottom: 37.33rpx; + margin-bottom: 11.33rpx; .recommend_content_item_image_name{ overflow: hidden; @@ -387,7 +446,7 @@ .recommend_content_item_pric{ font-size: 32rpx; font-weight: bold; - margin-top: 34rpx; + margin-top: 6rpx; } } } diff --git a/common/scss/order.scss b/common/scss/order.scss index 4065f49..cb7bcb1 100644 --- a/common/scss/order.scss +++ b/common/scss/order.scss @@ -13,7 +13,7 @@ color: white; font-size: 18.67rpx; font-weight: bold; - border-top: 14.67rpx #F6F5FA solid; + // border-top: 14.67rpx #F6F5FA solid; .shipped_right_text{ width: 497.33rpx; diff --git a/config.js b/config.js index 15ac944..685bee4 100644 --- a/config.js +++ b/config.js @@ -1,4 +1,5 @@ -var weburl='en.meixx.com'; + // var weburl='en.meixx.com'; + var weburl = 'lilbeattranapismits.dopeplus.com'; export default { apiUri: 'https://'+weburl+'/', imgUri: 'http://'+weburl+'/', diff --git a/js_sdk/mmmm-image-tools/index.js b/js_sdk/mmmm-image-tools/index.js new file mode 100644 index 0000000..acf40bc --- /dev/null +++ b/js_sdk/mmmm-image-tools/index.js @@ -0,0 +1,196 @@ +function getLocalFilePath(path) { + if (path.indexOf('_www') === 0 || path.indexOf('_doc') === 0 || path.indexOf('_documents') === 0 || path.indexOf('_downloads') === 0) { + return path + } + if (path.indexOf('file://') === 0) { + return path + } + if (path.indexOf('/storage/emulated/0/') === 0) { + return path + } + if (path.indexOf('/') === 0) { + var localFilePath = plus.io.convertAbsoluteFileSystem(path) + if (localFilePath !== path) { + return localFilePath + } else { + path = path.substr(1) + } + } + return '_www/' + path +} + +function dataUrlToBase64(str) { + var array = str.split(',') + return array[array.length - 1] +} + +var index = 0 +function getNewFileId() { + return Date.now() + String(index++) +} + +function biggerThan(v1, v2) { + var v1Array = v1.split('.') + var v2Array = v2.split('.') + var update = false + for (var index = 0; index < v2Array.length; index++) { + var diff = v1Array[index] - v2Array[index] + if (diff !== 0) { + update = diff > 0 + break + } + } + return update +} + +export function pathToBase64(path) { + return new Promise(function(resolve, reject) { + if (typeof window === 'object' && 'document' in window) { + if (typeof FileReader === 'function') { + var xhr = new XMLHttpRequest() + xhr.open('GET', path, true) + xhr.responseType = 'blob' + xhr.onload = function() { + if (this.status === 200) { + let fileReader = new FileReader() + fileReader.onload = function(e) { + resolve(e.target.result) + } + fileReader.onerror = reject + fileReader.readAsDataURL(this.response) + } + } + xhr.onerror = reject + xhr.send() + return + } + var canvas = document.createElement('canvas') + var c2x = canvas.getContext('2d') + var img = new Image + img.onload = function() { + canvas.width = img.width + canvas.height = img.height + c2x.drawImage(img, 0, 0) + resolve(canvas.toDataURL()) + canvas.height = canvas.width = 0 + } + img.onerror = reject + img.src = path + return + } + if (typeof plus === 'object') { + plus.io.resolveLocalFileSystemURL(getLocalFilePath(path), function(entry) { + entry.file(function(file) { + var fileReader = new plus.io.FileReader() + fileReader.onload = function(data) { + resolve(data.target.result) + } + fileReader.onerror = function(error) { + reject(error) + } + fileReader.readAsDataURL(file) + }, function(error) { + reject(error) + }) + }, function(error) { + reject(error) + }) + return + } + if (typeof wx === 'object' && wx.canIUse('getFileSystemManager')) { + wx.getFileSystemManager().readFile({ + filePath: path, + encoding: 'base64', + success: function(res) { + resolve('data:image/png;base64,' + res.data) + }, + fail: function(error) { + reject(error) + } + }) + return + } + reject(new Error('not support')) + }) +} + +export function base64ToPath(base64) { + return new Promise(function(resolve, reject) { + if (typeof window === 'object' && 'document' in window) { + base64 = base64.split(',') + var type = base64[0].match(/:(.*?);/)[1] + var str = atob(base64[1]) + var n = str.length + var array = new Uint8Array(n) + while (n--) { + array[n] = str.charCodeAt(n) + } + return resolve((window.URL || window.webkitURL).createObjectURL(new Blob([array], { type: type }))) + } + var extName = base64.split(',')[0].match(/data\:\S+\/(\S+);/) + if (extName) { + extName = extName[1] + } else { + reject(new Error('base64 error')) + } + var fileName = getNewFileId() + '.' + extName + if (typeof plus === 'object') { + var basePath = '_doc' + var dirPath = 'uniapp_temp' + var filePath = basePath + '/' + dirPath + '/' + fileName + if (!biggerThan(plus.os.name === 'Android' ? '1.9.9.80627' : '1.9.9.80472', plus.runtime.innerVersion)) { + plus.io.resolveLocalFileSystemURL(basePath, function(entry) { + entry.getDirectory(dirPath, { + create: true, + exclusive: false, + }, function(entry) { + entry.getFile(fileName, { + create: true, + exclusive: false, + }, function(entry) { + entry.createWriter(function(writer) { + writer.onwrite = function() { + resolve(filePath) + } + writer.onerror = reject + writer.seek(0) + writer.writeAsBinary(dataUrlToBase64(base64)) + }, reject) + }, reject) + }, reject) + }, reject) + return + } + var bitmap = new plus.nativeObj.Bitmap(fileName) + bitmap.loadBase64Data(base64, function() { + bitmap.save(filePath, {}, function() { + bitmap.clear() + resolve(filePath) + }, function(error) { + bitmap.clear() + reject(error) + }) + }, function(error) { + bitmap.clear() + reject(error) + }) + return + } + if (typeof wx === 'object' && wx.canIUse('getFileSystemManager')) { + var filePath = wx.env.USER_DATA_PATH + '/' + fileName + wx.getFileSystemManager().writeFile({ + filePath: filePath, + data: dataUrlToBase64(base64), + encoding: 'base64', + success: function() { + resolve(filePath) + }, + fail: function(error) { + reject(error) + } + }) + return + } + reject(new Error('not support')) + }) +} \ No newline at end of file diff --git a/js_sdk/mmmm-image-tools/package.json b/js_sdk/mmmm-image-tools/package.json new file mode 100644 index 0000000..e8b9c0a --- /dev/null +++ b/js_sdk/mmmm-image-tools/package.json @@ -0,0 +1,11 @@ +{ + "id": "mmmm-image-tools", + "name": "image-tools", + "version": "1.4.0", + "description": "图像转换工具,可用于图像和base64的转换", + "keywords": [ + "base64", + "保存", + "图像" + ] +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index e9a047e..1b8d246 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "DOPE PLUS", + "name" : "Dope Plus", "appid" : "__UNI__A6CF3EA", "description" : "", "versionName" : "1.0.0", @@ -11,11 +11,22 @@ "nvueStyleCompiler" : "uni-app", "compilerVersion" : 3, "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, + "alwaysShowBeforeRender" : false, + "waiting" : false, "autoclose" : true, "delay" : 0 }, + // "splashscreen" : { + // "alwaysShowBeforeRender" : false, + // "autoclose" : false, + // "waiting" : false, + // "delay" : 0 + // }, + "safearea" : { + "bottom" : { + "offset" : "none" + } + }, /* 模块配置 */ "modules" : { "Payment" : {}, @@ -67,6 +78,10 @@ }, "splashscreen" : { "androidStyle" : "default", + "alwaysShowBeforeRender" : false, + "autoclose" : false, + "waiting" : false, + "delay" : 0, "android" : { "hdpi" : "unpackage/res/icons/dope2.png", "xhdpi" : "unpackage/res/icons/dope2.png", diff --git a/pages.json b/pages.json index 186bca7..0248563 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,19 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/index/first", + "style": { + "navigationStyle":"custom", + "app-plus": { + "safearea":{ + "background" : "none", + "bottom":{ + "offset":"none" + } + } + } + } + }, { "path": "pages/index/index", "style": { @@ -74,14 +88,14 @@ "path": "pages/account/myProfile", "style": { "navigationBarTitleText": "My Profile", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/account/settings", "style": { "navigationBarTitleText": "Settings", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { @@ -102,48 +116,55 @@ { "path": "pages/account/favorites", "style": { - "titleNView":false + "titleNView":false, + "navigationBarBackgroundColor":"#000000" + } }, { "path": "pages/account/message", "style": { - "titleNView":false + "titleNView":false, + "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/account/new", "style": { "navigationBarTitleText": "nothing", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/login/index", "style": { - "navigationBarTitleText": " ", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationStyle":"custom", + "enablePullDownRefresh": false + // "navigationBarTitleText": " ", + // "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/login/verifyEmail", "style": { "navigationBarTitleText": "Verify Email Address", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/login/changePwd", "style": { "navigationBarTitleText": "Change Password", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/account/myOrders", "style": { "navigationBarTitleText": "My orders", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000", + "navigationBarTextStyle": "white" + } }, { @@ -158,14 +179,14 @@ "path": "pages/order/confirmation", "style": { "navigationBarTitleText": "Order Confirmation", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/order/paypalWebview", "style": { "navigationBarTitleText": " ", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { @@ -190,7 +211,7 @@ "path": "pages/order/paySuccess", "style": { "navigationBarTitleText": "Pay success", - "navigationBarBackgroundColor":"#FFFFFF", + "navigationBarBackgroundColor":"#000000", "enablePullDownRefresh":true } }, @@ -198,14 +219,14 @@ "path": "pages/account/address", "style": { "navigationBarTitleText": "Shipping Address", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/account/addAddress", "style": { "navigationBarTitleText": "Shipping Address", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { @@ -219,7 +240,7 @@ "path": "pages/order/details", "style": { "navigationBarTitleText": "Order details", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" // "app-plus": { // "titleNView": { // "splitLine":{ @@ -234,21 +255,21 @@ "path": "pages/order/logisticsDetails", "style": { "navigationBarTitleText": "Logistics details", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/order/refund", "style": { "navigationBarTitleText": "Refund", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { "path": "pages/order/refundDetails", "style": { "navigationBarTitleText": "Refund Details", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { @@ -256,7 +277,8 @@ "style": { "titleNView":false, "enablePullDownRefresh":true, - "navigationBarTextStyle":"white" + // "navigationBarTextStyle":"white", + "navigationBarBackgroundColor": "#000000" } @@ -280,22 +302,24 @@ { "path": "pages/productDetails/goodsReview", "style": { - "navigationBarTitleText":"Review", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarTitleText":"Review" + } }, { "path": "pages/account/myReview", "style": { "navigationBarTitleText": "My Review", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000", + "navigationBarTextStyle": "white" + } }, { "path": "pages/account/demo1", "style": { "navigationBarTitleText": "My demo", - "navigationBarBackgroundColor":"#FFFFFF" + "navigationBarBackgroundColor":"#000000" } }, { @@ -307,7 +331,9 @@ { "path": "pages/index/flashSale", "style": { - "titleNView":false + "titleNView":false, + "navigationBarBackgroundColor":"#000000", + "navigationBarTextStyle": "white" } } ,{ @@ -321,8 +347,8 @@ } ], "globalStyle": { - - "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#000000", + "navigationBarTextStyle": "white", "navigationBarTitleText": "DOPE PLUS" }, @@ -357,7 +383,7 @@ "pagePath": "pages/shippingCart/index", "iconPath": "static/img/Cart.png", "selectedIconPath": "static/img/cart1.png", - "navigationBarTextStyle": "black", + "navigationBarTextStyle": "#000000", "text": "Cart" }, { diff --git a/pages/account/addAddress.vue b/pages/account/addAddress.vue index 65a4d88..c70595b 100644 --- a/pages/account/addAddress.vue +++ b/pages/account/addAddress.vue @@ -214,6 +214,10 @@ }) return } + else{ + this.query.consignee.city_name = this.city + this.query.consignee.city = " 0 " + } this.query.consignee.address=this.cityText+this.address }else{ if(this.query.consignee.city==0){ @@ -221,6 +225,7 @@ icon:'none', title:'Please Select City/Town' }) + return } } @@ -250,6 +255,7 @@ }) return } + this.query.consignee.address = this.address console.info(this.query) defaultRequest3(this.query,'consignee').then(res=>{ @@ -279,8 +285,8 @@ defaultRequest2(data).then(res=>{ let list =[] let listAll = [] - console.info(res) - // console.log(this.countryText) + // console.info(res) + // // console.log(this.countryText) if(res.error==0){ this.countryList=res.data if(this.countryText){ @@ -373,6 +379,8 @@ } else{ this.isSelect1 = false + // this.query.consignee.city = 1 + // this.query.consignee.city_name = this.city } } }) @@ -409,7 +417,7 @@ if(e.type==1){ e.data=JSON.parse(e.data) - // console.info(e.data) + console.info(e.data) this.query.consignee=e.data this.address = this.query.consignee.address if(e.data.default_address_id==e.data.address_id){ diff --git a/pages/account/address.vue b/pages/account/address.vue index fd56911..e13798d 100644 --- a/pages/account/address.vue +++ b/pages/account/address.vue @@ -92,7 +92,7 @@ getList(){ let data={_action:'getconsignees'} defaultRequest2(data).then(res=>{ - // console.info(res) + console.info(res) if(res.error==0){ this.list=res.data } diff --git a/pages/account/demo1.vue b/pages/account/demo1.vue index 989db30..92f36ee 100644 --- a/pages/account/demo1.vue +++ b/pages/account/demo1.vue @@ -9,4 +9,391 @@ + + + + + + \ No newline at end of file diff --git a/pages/account/favorites.vue b/pages/account/favorites.vue index 1f7a279..f4b21ed 100644 --- a/pages/account/favorites.vue +++ b/pages/account/favorites.vue @@ -1,7 +1,7 @@