Browse Source

合并冲突

master
Gaoxs 5 years ago
parent
commit
85b69722e3
  1. 2
      components/OrderGoods.vue
  2. 110
      components/Recommend.vue
  3. 2
      manifest.json
  4. 12
      pages/Loading/index.vue
  5. 36
      pages/home/components/Banner.vue
  6. 1
      pages/shop/GoodsCon/index.vue
  7. 413
      pages/shop/GoodsList/index.vue
  8. 2
      unpackage/resources/__UNI__C7A519E/www/__uniappopenlocation.js
  9. 2
      unpackage/resources/__UNI__C7A519E/www/__uniapppicker.js
  10. 8
      unpackage/resources/__UNI__C7A519E/www/app-config-service.js
  11. 4
      unpackage/resources/__UNI__C7A519E/www/app-service.js
  12. 2
      unpackage/resources/__UNI__C7A519E/www/app-view.js
  13. 2
      unpackage/resources/__UNI__C7A519E/www/manifest.json
  14. BIN
      unpackage/resources/__UNI__C7A519E/www/static/icon-cart-hot.png
  15. BIN
      unpackage/resources/__UNI__C7A519E/www/static/icon-class-hot.png
  16. BIN
      unpackage/resources/__UNI__C7A519E/www/static/icon-home-hot.png
  17. BIN
      unpackage/resources/__UNI__C7A519E/www/static/icon-user-hot.png
  18. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/dfh.png
  19. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/dfk.png
  20. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/dpj.png
  21. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/dsh.png
  22. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/group.png
  23. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/h5.png
  24. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/index-bg.png
  25. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/integralbg.jpg
  26. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/light.png
  27. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/news.png
  28. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/pricetitle.jpg
  29. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/promotionBg.png
  30. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/public.png
  31. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/record1.png
  32. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/record2.png
  33. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/record3.png
  34. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/record4.png
  35. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/redBg.png
  36. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/sh.png
  37. BIN
      unpackage/resources/__UNI__C7A519E/www/static/images/writeOffBg.jpg
  38. 2
      unpackage/resources/__UNI__C7A519E/www/view.css
  39. 4
      unpackage/resources/__UNI__C7A519E/www/view.umd.min.js
  40. 2
      utils/index.js

2
components/OrderGoods.vue

@ -16,7 +16,7 @@
v-if="cart.productInfo.attrInfo" v-if="cart.productInfo.attrInfo"
>{{ cart.productInfo.attrInfo.sku }}</view> >{{ cart.productInfo.attrInfo.sku }}</view>
<view class="money font-color-red">{{ cart.truePrice }}</view> <view class="money font-color-red">{{ cart.truePrice }}</view>
<view class="evaluate" v-if="evaluate == 3" @click="routerGo(cart)">评价</view> <view class="evaluate" v-if="evaluate == 3 && cart.isReply==0" @click="routerGo(cart)">评价</view>
</view> </view>
</view> </view>
</view> </view>

110
components/Recommend.vue

@ -6,13 +6,11 @@
<text class="iconfont icon-zhuangshixian lefticon"></text> <text class="iconfont icon-zhuangshixian lefticon"></text>
</view> </view>
<view class="recommendList acea-row row-between-wrapper"> <view class="recommendList acea-row row-between-wrapper">
<view <view @click="routerGo(item)" class="item" v-for="(item, recommendIndex) in hostProduct"
@click="routerGo(item)" :key="recommendIndex">
class="item" <view class="pictrue">
v-for="(item, recommendIndex) in hostProduct" <image :src="item.image" class="image" />
:key="recommendIndex" </view>
>
<view class="pictrue"><image :src="item.image" class="image" /></view>
<view class="name line1">{{ item.storeName }}</view> <view class="name line1">{{ item.storeName }}</view>
<view class="money font-color-red"> <view class="money font-color-red">
@ -24,47 +22,61 @@
</view> </view>
</template> </template>
<script> <script>
import { getHostProducts } from '@/api/store'; import {
import Loading from '@/components/Loading'; getHostProducts
export default { } from '@/api/store';
name: 'Recommend', import Loading from '@/components/Loading';
props: {}, export default {
components: { name: 'Recommend',
Loading props: {
}, recommendLoading: Boolean
data: function() { },
return { components: {
hostProduct: [], Loading
page: 1, },
limit: 20, watch: {
loadTitle: '', recommendLoading(nextLoading) {
loading: false, if (nextLoading) {
loadend: false this.hostProducts()
}; }
}, }
mounted: function() { },
this.hostProducts(); data: function () {
}, return {
methods: { hostProduct: [],
routerGo(item) { page: 1,
this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: item.id } }); limit: 20,
loadTitle: '',
loading: false,
loadend: false
};
},
mounted: function () {
this.hostProducts();
},
methods: {
routerGo(item) {
this.$yrouter.push({
path: '/pages/shop/GoodsCon/index',
query: {
id: item.id
}
});
},
hostProducts: function () {
let that = this;
if (that.loading) return; //false
if (that.loadend) return; //false
that.loading = true;
getHostProducts(that.page, that.limit).then(res => {
that.loading = false;
//apply();js;
that.hostProduct.push.apply(that.hostProduct, res.data);
that.loadend = res.data.length < that.limit; //
that.page = that.page + 1;
this.$emit('changeRecommendLoading', false)
});
}
}, },
hostProducts: function() { };
let that = this;
if (that.loading) return; //false
if (that.loadend) return; //false
that.loading = true;
getHostProducts(that.page, that.limit).then(res => {
that.loading = false;
//apply();js;
that.hostProduct.push.apply(that.hostProduct, res.data);
that.loadend = res.data.length < that.limit; //
that.page = that.page + 1;
});
}
},
onReachBottom() {
!this.loading && this.hostProducts();
}
};
</script> </script>

2
manifest.json

@ -2,7 +2,7 @@
"name" : "yshopmall", "name" : "yshopmall",
"appid" : "__UNI__C7A519E", "appid" : "__UNI__C7A519E",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.1",
"versionCode" : 1, "versionCode" : 1,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */

12
pages/Loading/index.vue

@ -47,12 +47,12 @@
cookie.set("spread", urlSpread); cookie.set("spread", urlSpread);
} }
} }
// if (this.$deviceType == "app" || this.$deviceType == "weixinh5") { if (this.$deviceType == "app" || this.$deviceType == "weixinh5") {
// this.$yrouter.switchTab({ this.$yrouter.switchTab({
// path: "/pages/home/index" path: "/pages/home/index"
// }); });
// return; return;
// } }
if (this.$store.getters.token) { if (this.$store.getters.token) {
// token // token
console.log('登录状态存在,直接进页面') console.log('登录状态存在,直接进页面')

36
pages/home/components/Banner.vue

@ -41,46 +41,14 @@
let item = this.detail[this.swiperCurrent]; let item = this.detail[this.swiperCurrent];
// //
let bgcolor = item.bgcolor; let bgcolor = item.bgcolor;
// #ifdef APP-PLUS
that.$set(item, 'bgcolor', '#c40414');
that.$emit('getbgcolor', '#c40414');
// #endif
// #ifndef APP-PLUS
// //
if (bgcolor === '') { if (bgcolor === '') {
let ctx = uni.createCanvasContext('colorThief', that); that.$set(item, 'bgcolor', '#c40414');
if (0 === that.webviewId || ctx.webviewId === that.webviewId) { that.$emit('getbgcolor', '#c40414');
that.webviewId = ctx.webviewId;
uni.getImageInfo({
src: item.pic,
success: function (image) {
ctx.drawImage(image.path, 0, 0, image.width, image.height);
ctx.draw(true, function (e) {
uni.canvasGetImageData({
canvasId: 'colorThief',
x: 0,
y: 0,
width: parseInt(image.width),
height: parseInt(image.height),
success(res) {
let bgcolor = colorThief(res.data)
.color()
.getHex();
that.$set(item, 'bgcolor', bgcolor);
that.$emit('getbgcolor', bgcolor);
}
},
that
);
});
}
});
}
} else { } else {
that.$set(item, 'bgcolor', bgcolor); that.$set(item, 'bgcolor', bgcolor);
that.$emit('getbgcolor', bgcolor); that.$emit('getbgcolor', bgcolor);
} }
// #endif
}, },
swiperChange(e) { swiperChange(e) {

1
pages/shop/GoodsCon/index.vue

@ -308,6 +308,7 @@
}, },
computed: mapGetters(["isLogin", "location"]), computed: mapGetters(["isLogin", "location"]),
mounted: function () { mounted: function () {
this.$store.commit("get_to", "goodcon");
let url = handleQrCode(); let url = handleQrCode();
if (!url) { if (!url) {
url = handleUrlParam(getCurrentPageUrlWithArgs()) url = handleUrlParam(getCurrentPageUrlWithArgs())

413
pages/shop/GoodsList/index.vue

@ -3,22 +3,14 @@
<form @submit.prevent="submitForm"> <form @submit.prevent="submitForm">
<view class="search bg-color-red acea-row row-between-wrapper"> <view class="search bg-color-red acea-row row-between-wrapper">
<view class="input acea-row row-between-wrapper"> <view class="input acea-row row-between-wrapper">
<text class="iconfont icon-sousuo"></text>
<input placeholder="搜索商品信息" v-model="where.keyword" /> <input placeholder="搜索商品信息" v-model="where.keyword" />
<text class="iconfont icon-sousuo" @click="submitForm"></text>
</view> </view>
<view <view class="iconfont" :class="Switch === true ? 'icon-pailie' : 'icon-tupianpailie'" @click="switchTap"></view>
class="iconfont"
:class="Switch === true ? 'icon-pailie' : 'icon-tupianpailie'"
@click="switchTap"
></view>
</view> </view>
</form> </form>
<view class="nav acea-row row-middle"> <view class="nav acea-row row-middle">
<view <view class="item" :class="title ? 'font-color-red' : ''" @click="set_where(0)">{{ title ? title : "默认" }}</view>
class="item"
:class="title ? 'font-color-red' : ''"
@click="set_where(0)"
>{{ title ? title : "默认" }}</view>
<view class="item" @click="set_where(1)"> <view class="item" @click="set_where(1)">
价格 价格
<image src="@/static/images/horn.png" v-if="price === 0" /> <image src="@/static/images/horn.png" v-if="price === 0" />
@ -34,19 +26,9 @@
<!-- down --> <!-- down -->
<view class="item" :class="nows ? 'font-color-red' : ''" @click="set_where(3)">新品</view> <view class="item" :class="nows ? 'font-color-red' : ''" @click="set_where(3)">新品</view>
</view> </view>
<view <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container">
class="list acea-row row-between-wrapper" <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'"
:class="Switch === true ? '' : 'on'" v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
ref="container"
>
<view
@click="goGoodsCon(item)"
class="item"
:class="Switch === true ? '' : 'on'"
v-for="(item, productListIndex) in productList"
:key="productListIndex"
:title="item.storeName"
>
<view class="pictrue" :class="Switch === true ? '' : 'on'"> <view class="pictrue" :class="Switch === true ? '' : 'on'">
<image :src="item.image" :class="Switch === true ? '' : 'on'" /> <image :src="item.image" :class="Switch === true ? '' : 'on'" />
</view> </view>
@ -64,209 +46,222 @@
</view> </view>
</view> </view>
<Loading :loaded="loadend" :loading="loading"></Loading> <Loading :loaded="loadend" :loading="loading"></Loading>
<view <view class="noCommodity" style="background-color: #fff;" v-if="productList.length === 0 && where.page > 1">
class="noCommodity"
style="background-color: #fff;"
v-if="productList.length === 0 && where.page > 1"
>
<view class="noPictrue"> <view class="noPictrue">
<image src="@/static/images/noGood.png" class="image" /> <image src="@/static/images/noGood.png" class="image" />
</view> </view>
</view> </view>
<Recommend v-if="productList.length === 0 && where.page > 1"></Recommend> <Recommend v-if="productList.length === 0 && where.page > 1" :recommendLoading="recommendLoading"
@changeRecommendLoading="changeRecommendLoading"></Recommend>
</view> </view>
</template> </template>
<script> <script>
import Recommend from "@/components/Recommend"; import Recommend from "@/components/Recommend";
import { getProducts } from "@/api/store"; import {
import Loading from "@/components/Loading"; getProducts
} from "@/api/store";
import Loading from "@/components/Loading";
export default { export default {
name: "GoodsList", name: "GoodsList",
components: { components: {
Recommend, Recommend,
Loading Loading
}, },
props: {}, props: {},
data: function() { data: function () {
// const { s = "", id = 0, title = "" } = this.$yroute.query; // const { s = "", id = 0, title = "" } = this.$yroute.query;
const s = "", const s = "",
id = 0, id = 0,
title = ""; title = "";
return { return {
hostProduct: [], hostProduct: [],
productList: [], productList: [],
Switch: true, Switch: true,
where: { where: {
page: 1, page: 1,
limit: 8, limit: 8,
keyword: s, keyword: s,
sid: id, //id sid: id, //id
news: 0, news: 0,
priceOrder: "", priceOrder: "",
salesOrder: "" salesOrder: ""
},
title: title && id ? title : "",
loadTitle: "",
loading: false,
loadend: false,
price: 0,
stock: 0,
nows: false,
recommendLoading: false
};
},
watch: {
title() {
this.updateTitle();
}, },
title: title && id ? title : "", $yroute(to) {
loadTitle: "", // if (to.name !== "GoodsList") return;
loading: false, // const { s = "", id = 0, title = "" } = to.query;
loadend: false, // if (s !== this.where.keyword || id !== this.where.sid) {
price: 0, // this.where.keyword = s;
stock: 0, // this.loadend = false;
nows: false // this.loading = false;
}; // this.where.page = 1;
}, // this.where.sid = id;
watch: { // this.title = title && id ? title : "";
title() { // this.nows = false;
// this.$set(this, "productList", []);
// this.price = 0;
// this.stock = 0;
// this.get_product_list();
// }
}
},
mounted: function () {
const {
s = "", id = 0, title = ""
} = this.$yroute.query;
this.where.keyword = s;
this.updateTitle(); this.updateTitle();
this.get_product_list();
}, },
$yroute(to) { onReachBottom() {
// if (to.name !== "GoodsList") return; this.recommendLoading = true;
// const { s = "", id = 0, title = "" } = to.query; !this.loading && this.get_product_list();
// if (s !== this.where.keyword || id !== this.where.sid) {
// this.where.keyword = s;
// this.loadend = false;
// this.loading = false;
// this.where.page = 1;
// this.where.sid = id;
// this.title = title && id ? title : "";
// this.nows = false;
// this.$set(this, "productList", []);
// this.price = 0;
// this.stock = 0;
// this.get_product_list();
// }
}
},
mounted: function() {
const { s = "", id = 0, title = "" } = this.$yroute.query;
this.updateTitle();
this.get_product_list();
},
onReachBottom() {
!this.loading && this.get_product_list();
},
onHide() {
// this.hostProduct = [];
// this.productList = [];
// this.Switch = true;
// this.where = {
// page: 1,
// limit: 8,
// keyword: s,
// sid: id, //id
// news: 0,
// priceOrder: "",
// salesOrder: ""
// };
// this.loadTitle = "";
// this.loading = false;
// this.loadend = false;
// this.price = 0;
// this.stock = 0;
// this.nows = fals;
},
methods: {
goGoodsCon(item) {
this.$yrouter.push({
path: "/pages/shop/GoodsCon/index",
query: { id: item.id }
});
}, },
updateTitle() { onHide() {
// document.title = this.title || this.$yroute.meta.title; // this.hostProduct = [];
// this.productList = [];
// this.Switch = true;
// this.where = {
// page: 1,
// limit: 8,
// keyword: s,
// sid: id, //id
// news: 0,
// priceOrder: "",
// salesOrder: ""
// };
// this.loadTitle = "";
// this.loading = false;
// this.loadend = false;
// this.price = 0;
// this.stock = 0;
// this.nows = fals;
}, },
get_product_list() { methods: {
var that = this; changeRecommendLoading(recommendLoading) {
this.setWhere(); this.recommendLoading = recommendLoading
// if (to.name !== "GoodsList") return; },
const { s = "", id = 0, title = "" } = this.$yroute.query; goGoodsCon(item) {
if (s !== this.where.keyword || id !== this.where.sid) { this.$yrouter.push({
this.where.keyword = s; path: "/pages/shop/GoodsCon/index",
query: {
id: item.id
}
});
},
updateTitle() {
// document.title = this.title || this.$yroute.meta.title;
},
get_product_list() {
var that = this;
this.setWhere();
// if (to.name !== "GoodsList") return;
const {
s = "", id = 0, title = ""
} = this.$yroute.query;
if (s !== this.where.keyword || id !== this.where.sid) {
this.loadend = false;
this.loading = false;
this.where.page = 1;
this.where.sid = id;
this.title = title && id ? title : "";
this.nows = false;
this.$set(this, "productList", []);
this.price = 0;
this.stock = 0;
// this.get_product_list();
}
let q = that.where;
getProducts(q).then(res => {
that.loading = false;
that.productList.push.apply(that.productList, res.data);
that.loadend = res.data.length < that.where.limit; //
that.where.page = that.where.page + 1;
});
},
submitForm: function () {
this.$set(this, "productList", []);
this.where.page = 1;
this.loadend = false; this.loadend = false;
this.loading = false; this.loading = false;
this.where.page = 1; this.get_product_list();
this.where.sid = id; },
this.title = title && id ? title : ""; //
this.nows = false; set_where: function (index) {
this.$set(this, "productList", []); let that = this;
this.price = 0; switch (index) {
this.stock = 0; case 0:
// this.get_product_list(); return that.$yrouter.push({
} path: "/pages/shop/GoodsClass/index"
let q = that.where; });
getProducts(q).then(res => { case 1:
that.loading = false; if (that.price === 0) that.price = 1;
that.productList.push.apply(that.productList, res.data); else if (that.price === 1) that.price = 2;
that.loadend = res.data.length < that.where.limit; // else if (that.price === 2) that.price = 0;
that.where.page = that.where.page + 1; that.stock = 0;
}); break;
}, case 2:
submitForm: function() { if (that.stock === 0) that.stock = 1;
this.$set(this, "productList", []); else if (that.stock === 1) that.stock = 2;
this.where.page = 1; else if (that.stock === 2) that.stock = 0;
this.loadend = false; that.price = 0;
this.loading = false; break;
this.get_product_list(); case 3:
}, that.nows = !that.nows;
// break;
set_where: function(index) { default:
let that = this; break;
switch (index) { }
case 0: that.$set(that, "productList", []);
return that.$yrouter.push({ path: "/pages/shop/GoodsClass/index" }); that.where.page = 1;
case 1: that.loadend = false;
if (that.price === 0) that.price = 1; that.get_product_list();
else if (that.price === 1) that.price = 2; },
else if (that.price === 2) that.price = 0; //where
that.stock = 0; setWhere: function () {
break; let that = this;
case 2: if (that.price === 0) {
if (that.stock === 0) that.stock = 1; that.where.priceOrder = "";
else if (that.stock === 1) that.stock = 2; } else if (that.price === 1) {
else if (that.stock === 2) that.stock = 0; that.where.priceOrder = "asc";
that.price = 0; } else if (that.price === 2) {
break; that.where.priceOrder = "desc";
case 3: }
that.nows = !that.nows; if (that.stock === 0) {
break; that.where.salesOrder = "";
default: } else if (that.stock === 1) {
break; that.where.salesOrder = "asc";
} } else if (that.stock === 2) {
that.$set(that, "productList", []); that.where.salesOrder = "desc";
that.where.page = 1; }
that.loadend = false; that.where.news = that.nows ? "1" : "0";
that.get_product_list(); },
}, switchTap: function () {
//where let that = this;
setWhere: function() { that.Switch = !that.Switch;
let that = this;
if (that.price === 0) {
that.where.priceOrder = "";
} else if (that.price === 1) {
that.where.priceOrder = "asc";
} else if (that.price === 2) {
that.where.priceOrder = "desc";
}
if (that.stock === 0) {
that.where.salesOrder = "";
} else if (that.stock === 1) {
that.where.salesOrder = "asc";
} else if (that.stock === 2) {
that.where.salesOrder = "desc";
} }
that.where.news = that.nows ? "1" : "0";
},
switchTap: function() {
let that = this;
that.Switch = !that.Switch;
} }
} };
};
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.noCommodity { .noCommodity {
border-top: 3px solid #f5f5f5; border-top: 3px solid #f5f5f5;
padding-bottom: 1px; padding-bottom: 1px;
} }
</style> </style>

2
unpackage/resources/__UNI__C7A519E/www/__uniappopenlocation.js

File diff suppressed because one or more lines are too long

2
unpackage/resources/__UNI__C7A519E/www/__uniapppicker.js

File diff suppressed because one or more lines are too long

8
unpackage/resources/__UNI__C7A519E/www/app-config-service.js

File diff suppressed because one or more lines are too long

4
unpackage/resources/__UNI__C7A519E/www/app-service.js

File diff suppressed because one or more lines are too long

2
unpackage/resources/__UNI__C7A519E/www/app-view.js

File diff suppressed because one or more lines are too long

2
unpackage/resources/__UNI__C7A519E/www/manifest.json

@ -1 +1 @@
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__C7A519E","name":"yshopmall","version":{"name":"1.0.0","code":1},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Share":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","compilerVersion":3,"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.6.8","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#282828","selectedColor":"#00c17b","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/home/index","iconPath":"static/icon-home.png","selectedIconPath":"static/icon-home-hot.png","text":"首页"},{"pagePath":"pages/shop/GoodsClass/index","iconPath":"static/icon-class.png","selectedIconPath":"static/icon-class-hot.png","text":"分类"},{"pagePath":"pages/shop/ShoppingCart/index","iconPath":"static/icon-cart.png","selectedIconPath":"static/icon-cart-hot.png","text":"购物车"},{"pagePath":"pages/user/User/index","iconPath":"static/icon-user.png","selectedIconPath":"static/icon-user-hot.png","text":"我的"}]},"launch_path":"__uniappview.html"}} {"@platforms":["android","iPhone","iPad"],"id":"__UNI__C7A519E","name":"yshopmall","version":{"name":"1.0.0","code":1},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Share":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":false,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","compilerVersion":3,"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.8.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#282828","selectedColor":"#eb3729","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/home/index","iconPath":"static/icon-home.png","selectedIconPath":"static/icon-home-hot.png","text":"首页"},{"pagePath":"pages/shop/GoodsClass/index","iconPath":"static/icon-class.png","selectedIconPath":"static/icon-class-hot.png","text":"分类"},{"pagePath":"pages/shop/ShoppingCart/index","iconPath":"static/icon-cart.png","selectedIconPath":"static/icon-cart-hot.png","text":"购物车"},{"pagePath":"pages/user/User/index","iconPath":"static/icon-user.png","selectedIconPath":"static/icon-user-hot.png","text":"我的"}]},"launch_path":"__uniappview.html"}}

BIN
unpackage/resources/__UNI__C7A519E/www/static/icon-cart-hot.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/icon-class-hot.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/icon-home-hot.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/icon-user-hot.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/dfh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/dfk.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/dpj.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/dsh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/group.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/h5.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/index-bg.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/integralbg.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/light.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/news.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/pricetitle.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/promotionBg.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/public.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/record1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/record2.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/record3.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/record4.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/redBg.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/sh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
unpackage/resources/__UNI__C7A519E/www/static/images/writeOffBg.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

2
unpackage/resources/__UNI__C7A519E/www/view.css

File diff suppressed because one or more lines are too long

4
unpackage/resources/__UNI__C7A519E/www/view.umd.min.js vendored

File diff suppressed because one or more lines are too long

2
utils/index.js

@ -988,7 +988,7 @@ export function chooseImage(callback) {
console.log(image); console.log(image);
uni.showLoading({ title: "图片上传中", mask: true }); uni.showLoading({ title: "图片上传中", mask: true });
uni.uploadFile({ uni.uploadFile({
url: `${VUE_APP_API_URL} /api/upload`, url: `${VUE_APP_API_URL}/api/upload`,
file: image, file: image,
filePath: image.path, filePath: image.path,
header: { header: {

Loading…
Cancel
Save