diff --git a/package-lock.json b/package-lock.json
index c13cd9b..6e3b81c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9254,6 +9254,11 @@
"minipass": "^3.0.0"
}
},
+ "miniprogram-skeleton": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/miniprogram-skeleton/-/miniprogram-skeleton-1.0.3.tgz",
+ "integrity": "sha512-oDt4rPP1gRYqlNuMcN+LQ0HDcEbBssOnp/weyZQsGV6+bDM++ClIX3AVU4LQBu3CF3XZ6n5qQIJJXt70e0Igsg=="
+ },
"mississippi": {
"version": "3.0.0",
"resolved": "http://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz",
diff --git a/package.json b/package.json
index 1703d3e..2f75640 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
"@dcloudio/uni-stat": "^2.0.0-26920200424005",
"core-js": "^3.6.4",
"flyio": "^0.6.2",
+ "miniprogram-skeleton": "^1.0.3",
"regenerator-runtime": "^0.12.1",
"sass-resources-loader": "^2.0.3",
"vue": "^2.6.11",
diff --git a/src/components/EasyLoadimage/EasyLoadimage.vue b/src/components/EasyLoadimage/EasyLoadimage.vue
index a14d1d8..6448b06 100644
--- a/src/components/EasyLoadimage/EasyLoadimage.vue
+++ b/src/components/EasyLoadimage/EasyLoadimage.vue
@@ -57,7 +57,8 @@ export default{
loadImg:false,
showImg:false,
isLoadError:false,
- showTransition:false
+ showTransition:false,
+ defaultImg: '/static/easy-loadimage/loading.gif'
}
},
methods:{
@@ -99,9 +100,13 @@ export default{
diff --git a/src/pages.json b/src/pages.json
index 5b6074c..5857432 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -60,42 +60,42 @@
"navigationBarTitleText": "产品详情"
}
},
- {
- "path": "pages/refundProgress/refundProgress",
- "style": {
- "navigationBarTitleText": "申请退款"
- }
- },
- {
- "path": "pages/address/addAddress",
- "style": {
- "navigationBarTitleText": "新增地址"
- }
- },
- {
- "path": "pages/address/addressList",
- "style": {
- "navigationBarTitleText": "地址管理"
- }
- },
+ // {
+ // "path": "pages/refundProgress/refundProgress",
+ // "style": {
+ // "navigationBarTitleText": "申请退款"
+ // }
+ // },
+ // {
+ // "path": "pages/address/addAddress",
+ // "style": {
+ // "navigationBarTitleText": "新增地址"
+ // }
+ // },
+ // {
+ // "path": "pages/address/addressList",
+ // "style": {
+ // "navigationBarTitleText": "地址管理"
+ // }
+ // },
{
"path": "pages/confirmOrder/confirmOrder",
"style": {
"navigationBarTitleText": "确认订单"
}
},
- {
- "path": "pages/refundment/refundWays",
- "style": {
- "navigationBarTitleText": "退款方式"
- }
- },
- {
- "path": "pages/refundment/refundment",
- "style": {
- "navigationBarTitleText": "申请退款"
- }
- },
+ // {
+ // "path": "pages/refundment/refundWays",
+ // "style": {
+ // "navigationBarTitleText": "退款方式"
+ // }
+ // },
+ // {
+ // "path": "pages/refundment/refundment",
+ // "style": {
+ // "navigationBarTitleText": "申请退款"
+ // }
+ // },
{
"path": "pages/predelivery/predelivery",
"style": {
@@ -126,7 +126,25 @@
"navigationBarTitleText": "验光数据"
}
}
- ],
+ ],
+ "subpackages": [
+ {
+ "root": "pages/refundment",
+ "pages": [
+ "pages/refundment/refundWays",
+ "pages/refundment/refundment",
+ "pages/refundProgress/refundProgress"
+ ]
+ },
+ {
+ "root": "pages/address",
+ "name": "pack2",
+ "pages": [
+ "pages/address/addAddress",
+ "pages/address/addressList"
+ ]
+ }
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
@@ -162,6 +180,11 @@
"condition": {
"current": 0,
"list": [
+ // {
+ // "name": "首页",
+ // "path": "pages/test/index",
+ // "query": ""
+ // },
{
"name": "首页",
"path": "pages/index/index",
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index a5748d7..ba6aad8 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,8 +1,9 @@
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/static/easy-loadimage/default.jpeg b/src/static/easy-loadimage/default.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..105e6466d61405caefa94bf81188932f32d72fad
GIT binary patch
literal 2191
zcmex=FJ5f8(SD#m}^+-X)|(h0oC$K@e4?qtIDex
zYHOS8n(OLn>w+*4f)EIpgBef`L8HifqZ75FTj9NIFN~%MNq^rsBoc>QKO=g<3XnniHkN)1S%H;
znFBWk%wPgpAtMM31y&R(MkYZa$3R1;|F;-;fMzoZG7B=;GyFXwb7^VeDc@hqXCyVu
zcfMjJw~kj|i>a1BoO$7^2jWv1?b=s2UiezTeF`Xh^}vg&9js3s{DD#>wlPef7N`TI
zfLa(U1B8K6vi#u;dsc9Mv5nztU)>NF!tzUQ9Xn7Lkp?>K*=?(S=~=bY+-Krt47_f8
zf5}Gv&UjOpapK+i+wMvGg12vZ9rPvL@S?U`o%l_okjt_hFV65L`;;gzHee=~tXe&B
z%D1-cl7t&+oA-QAo2)zAe7Bj+G{0GmFAP1RjI1|*yLjW##ff+4Z|gf+vpnOL@rQjU
zr))`oSUcHp0cyZQd5mv)uD$pGGLr2u$S_mMoSS=ZZuzM**R+8%NUW#t&EG9$7F$xv
z)88)M7_WKDtmlvZrc_QWE%@2Nh`p!{C$(*cg($Ms@Tm{br^&CySqzNak)2j6_v
z$;&n{YB@oI?KsrW+E1<#^N#nX9Y3FFySzbIZ$s
zWR}s*&DEPTKSf$)GYBn#rbtBY-ZVGM?{!}xm(N^q`q0WaqG{L>lva=}Wys}|BrEl3%$C$XwL*
z5N&wY!fui=L7VX`2VVv!(*~If4bK{&To5AZd$%;RB*H3AOXe
z0>#sx9$@F>!yg(4@go7!4a^UvxDu3FT3
VRFtK(&^TOL {
state.list = list;
@@ -25,10 +35,9 @@
category({
commit
}, param) {
- request({
+ return new Promise((resolve) => request({
url: category,
success: (res) => {
- console.log('category', res);
let data = res.data.data;
for (let i = 0; i <= data.length; i++) {
if (data[i] && data[i].type !== 'filter') {
@@ -40,35 +49,34 @@
name: "全部",
value: "all",
isNoPull: true,
-
});
commit('CATEGORY', data);
+ resolve(data)
+ console.log('3333')
},
fail: (res) => {
console.log("fail status === > ", res);
- },
- complete: (res) => {
- console.log("complete status === > ", res);
- },
- })
+ }
+ }))
+
},
list({
commit
}, param) {
-
- request({
+ return new Promise((resolve) => request({
url: shopList,
success: (res) => {
commit('LIST', res.data.data)
+ resolve(res.data)
+ console.log('3333')
},
fail: (res) => {
console.log("fail status === > ", res);
},
complete: (res) => {
- console.log("complete status === > ", res);
state.isLoading = false;
},
- })
+ }))
},
search({
commit
@@ -76,9 +84,8 @@
params,
keyword
}) {
- const uid = uni.getStorageSync('uid');
- console.log("params", params, keyword);
- request({
+ const uid = uni.getStorageSync('uid');
+ return new Promise((resolve) => request({
url: search,
data: {
params: JSON.stringify(params),
@@ -88,14 +95,13 @@
},
success: (res) => {
commit('LIST', res.data.data);
+ resolve(res.data)
},
fail: (res) => {
console.log("fail status === > ", res);
- },
- complete: (res) => {
- console.log("complete status === > ", res);
- },
- })
+ }
+ }))
+
},
};