diff --git a/.DS_Store b/.DS_Store index f9b5d183a67a2934a62df6d628aa110bf0d529f5..0a19ce8b9f08f6e98f71e30cec313321907f92da 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 2f7bff05a89546353f19499830f3d41cf1df8b14..ad9ad6141ed5ddcbec1c2d2952b0e44a49a92af9 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /unpackage/release/* /unpackage /node_modules/* +/unpackage /.idea/* deploy.sh .DS_Store diff --git a/order-module/checkout/checkout.vue b/order-module/checkout/checkout.vue index 78f5ce70edfea6a7f377c51e101a02d8eb6df1de..277df9b9a05372e649f3afd293823f563c7bd69e 100644 --- a/order-module/checkout/checkout.vue +++ b/order-module/checkout/checkout.vue @@ -909,13 +909,13 @@ export default { }, //获取购物清单，和结算金额 getCarts() { - let fun = () => API_Trade.getCarts('checked', this.way) - if(this.isAssemble){ - fun = API_Trade.getAssembleCarts() - } - if(this.crowdfundingShowFlag){ - fun = API_Crowdfunding.getCart() - } + let fun = API_Trade.getCarts('checked', this.way) + if(this.isAssemble){ + fun = API_Trade.getAssembleCarts() + } + if(this.crowdfundingShowFlag){ + fun = API_Crowdfunding.getCart() + } fun.then(response => { const { cart_list, total_price,coupon_list} = response this.orderTotal = total_price diff --git a/promotion-module/crowdfunding/index.vue b/promotion-module/crowdfunding/index.vue index 8ac411e4a9b6089601082c6db934110922845119..eb8bd40b1dae8bc2cd654d8c116157a280f86d3d 100644 --- a/promotion-module/crowdfunding/index.vue +++ b/promotion-module/crowdfunding/index.vue @@ -14,9 +14,9 @@ - + - + {{ formatProgressText(crowdfunding.price_percent_int) }} @@ -24,7 +24,7 @@ - + @@ -138,8 +138,9 @@ export default { .goods-item { padding: 20rpx; border: 2rpx solid #E4E7Ed; - margin: 20rpx; + margin: 30rpx 20rpx; border-radius: 20rpx; + box-shadow: 0 0 8rpx 0 rgba(0,0,0,0.1); .goods-img { width: 200rpx; @@ -159,7 +160,8 @@ export default { color: rgb(221, 188, 154); background-color: rgb(26, 25, 25); border-radius: 35rpx; - font-size: 35rpx; + font-weight: 500; + font-size: 22rpx; } .divide{ @@ -171,7 +173,8 @@ export default { .crowdfunding-data{ .font{ color: rgb(158, 147, 136); - font-size: 28rpx; + font-weight: 500; + font-size: 25rpx; } } } diff --git a/static/images/member/.DS_Store b/static/images/member/.DS_Store index 129df9b7bf8dfddc4228356d1492c4847bebfd1f..5bb0f4c26ae6c1efee863141e1cd55a07d421647 100644 Binary files a/static/images/member/.DS_Store and b/static/images/member/.DS_Store differ diff --git a/unpackage/docker/Dockerfile b/unpackage/docker/Dockerfile deleted file mode 100644 index 8d14d65f24bc0e9b9848914e6dbbb6000b13d6b4..0000000000000000000000000000000000000000 --- a/unpackage/docker/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM nginx:alpine -MAINTAINER ShopTnt - -RUN mkdir -p /app/ -COPY ./unpackage/dist/build/h5 /app/ -COPY ./unpackage/docker/nginx.conf /etc/nginx/nginx.conf - -EXPOSE 443 80 - -CMD sh -c "exec nginx -g 'daemon off;'" \ No newline at end of file diff --git a/unpackage/docker/nginx.conf b/unpackage/docker/nginx.conf deleted file mode 100644 index d0af69ac16ec1b447521b1aa1dff7d5a2bbed188..0000000000000000000000000000000000000000 --- a/unpackage/docker/nginx.conf +++ /dev/null @@ -1,51 +0,0 @@ -#这个文件给docker用的 -#user nobody; -worker_processes 1; - -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -#pid logs/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include mime.types; - default_type application/octet-stream; - - #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - # '$status $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "$http_x_forwarded_for"'; - - #access_log logs/access.log main; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - client_max_body_size 10m; - gzip on; - gzip_min_length 5k; - gzip_buffers 4 16k; - gzip_http_version 1.0; - gzip_comp_level 4; - gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; - gzip_vary on; - - server { - listen 80; - server_name localhost; - - location / { - root /app; - try_files $uri $uri/ /index.html $uri/ =404; - index index.html index.htm; - } - } -} \ No newline at end of file diff --git a/unpackage/res/icons/1024x1024.png b/unpackage/res/icons/1024x1024.png deleted file mode 100644 index 29a3d96665a6d839129f324b9c7412a2a43b7bdb..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/1024x1024.png and /dev/null differ diff --git a/unpackage/res/icons/120x120.png b/unpackage/res/icons/120x120.png deleted file mode 100644 index 535b17c0649231d7677f269c16660f7c56f1d816..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/120x120.png and /dev/null differ diff --git a/unpackage/res/icons/144x144.png b/unpackage/res/icons/144x144.png deleted file mode 100644 index 392ec434a0304018941defe4cd27656e1e7c8bf3..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/144x144.png and /dev/null differ diff --git a/unpackage/res/icons/152x152.png b/unpackage/res/icons/152x152.png deleted file mode 100644 index cec85cc258b739b9d99543e048c1dbbf6743b46c..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/152x152.png and /dev/null differ diff --git a/unpackage/res/icons/167x167.png b/unpackage/res/icons/167x167.png deleted file mode 100644 index cc38c7ed36b756e664570ec07f340b6f148ddbbc..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/167x167.png and /dev/null differ diff --git a/unpackage/res/icons/180x180.png b/unpackage/res/icons/180x180.png deleted file mode 100644 index db092e8e86ceae186a515f18ebc22425e3adde1c..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/180x180.png and /dev/null differ diff --git a/unpackage/res/icons/192x192.png b/unpackage/res/icons/192x192.png deleted file mode 100644 index c162faa690b3a74dc10d159e7d77bd9f4aee815c..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/192x192.png and /dev/null differ diff --git a/unpackage/res/icons/20x20.png b/unpackage/res/icons/20x20.png deleted file mode 100644 index 71ddf0b9e3974a33e7db9ee53071b49d11548ee0..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/20x20.png and /dev/null differ diff --git a/unpackage/res/icons/29x29.png b/unpackage/res/icons/29x29.png deleted file mode 100644 index 3ba2b8b192084ee2e9992b00f3a633cdeae0f5a7..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/29x29.png and /dev/null differ diff --git a/unpackage/res/icons/40x40.png b/unpackage/res/icons/40x40.png deleted file mode 100644 index 432c89d8e33afb366594ceeb66a3fd2d41341c6f..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/40x40.png and /dev/null differ diff --git a/unpackage/res/icons/58x58.png b/unpackage/res/icons/58x58.png deleted file mode 100644 index 1d633a6d8581439efb341f3ca05eedad41d275ce..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/58x58.png and /dev/null differ diff --git a/unpackage/res/icons/60x60.png b/unpackage/res/icons/60x60.png deleted file mode 100644 index 59383c48517ba2d5c618b2af2820834d85758f3b..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/60x60.png and /dev/null differ diff --git a/unpackage/res/icons/72x72.png b/unpackage/res/icons/72x72.png deleted file mode 100644 index a5425d8aa51f1c29708a7082017e372e7f34da0b..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/72x72.png and /dev/null differ diff --git a/unpackage/res/icons/76x76.png b/unpackage/res/icons/76x76.png deleted file mode 100644 index 0e1d36eb6160c821022f3b99fea47faebd1896a7..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/76x76.png and /dev/null differ diff --git a/unpackage/res/icons/80x80.png b/unpackage/res/icons/80x80.png deleted file mode 100644 index 7772b80a401cfca7acfb896fdc0965b70364d13b..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/80x80.png and /dev/null differ diff --git a/unpackage/res/icons/87x87.png b/unpackage/res/icons/87x87.png deleted file mode 100644 index 80bcaf64a83234c900cce44e37e71ddb4e81425f..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/87x87.png and /dev/null differ diff --git a/unpackage/res/icons/96x96.png b/unpackage/res/icons/96x96.png deleted file mode 100644 index e7a8e4bf08b056c2499f8943a0c01ba76360c1d0..0000000000000000000000000000000000000000 Binary files a/unpackage/res/icons/96x96.png and /dev/null differ