@@ -292,6 +292,7 @@
const myEchart = echarts.init(this.$refs.myEchart, 'light')
const option = {
+ color: "#3F9B6A",
xAxis: {
type: 'category',
data: arr.time
@@ -309,6 +310,7 @@
myEchart.setOption(option)
},
draws(arr) {
+ // myEchart
const myEchart = echarts.init(this.$refs.myEcharts, 'light')
// const o = this.chartData
const option = {
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index cc45fc9..65b5522 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -1,8 +1,8 @@
-// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
-// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
-const DOMAIN_PREFIXPING = 'http://128.10.249.206:9003'
-const DOMAIN_PREFIX = 'http://128.10.249.206:9007'
+const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
+const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
+// const DOMAIN_PREFIXPING = 'http://128.10.249.206:9003'
+// const DOMAIN_PREFIX = 'http://128.10.249.206:9007'
const LIULIANG = 'https://jy.scjysm.asia:18086/liuliang'
// const host = `${window.location.protocol}//${window.location.host}`
// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
index 3926df2..aaa6fc2 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
@@ -53,8 +53,11 @@
}
},
onLoad(options) {
- this.type = options.type;
- // console.log('评价',JSON.parse(options.detail))
+ let detail = JSON.parse(options.detail)
+ // options.detail =JSON.parse(options.detail)
+ this.type = detail.type;
+
+ console.log('评价',detail)
if(options.detail){
const params = this.$getJumpParam(options)
@@ -63,7 +66,7 @@
this.productImage = this.orderProductVO.image
}else{
- if(options.type == 1){
+ if(detail.type == 1){
this.addCommentVOList = uni.getStorageSync('addCommentVOList');
this.orderProductVO = this.addCommentVOList.skus[0]
this.productImage = this.orderProductVO.image
@@ -74,14 +77,15 @@
}
uni.removeStorageSync('addCommentVOList')
}
- if(options.commentId){
- this.commentId = options.commentId
+ if(detail.commentId){
+ this.commentId = detail.commentId
}
const res = uni.getStorageSync('storage_key');
this.headerToken.Authorization = res.token
},
onReady() {
this.fileList = this.$refs.uUpload.lists
+ console.log(this.fileList,'fffffffffffffffffffffffffffffff')
},
methods: {
submitTap(){
@@ -102,6 +106,7 @@
this.commentImgs += this.fileList[i].response.data+','
}
}
+
let data = []
if(this.type == 1){
data = [{
@@ -116,7 +121,7 @@
comment:this.commentText
}]
}
- console.log('上传评价',data)
+ console.log('上传评价',data,this.type)
// return
NET.request(API.AdditionalComment,{params:data} , 'POST').then(res => {
uni.hideLoading()
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodEvaluateAndQuestion.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodEvaluateAndQuestion.vue
index 511c331..034e589 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodEvaluateAndQuestion.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/components/GoodEvaluateAndQuestion.vue
@@ -46,7 +46,7 @@
@@ -63,10 +63,11 @@
v-for="(imgItem, imgIndex) in (commentItem.image.split(',')||[])"
:key="imgIndex"
>
+
@@ -88,7 +89,7 @@
@@ -212,6 +213,10 @@ export default {
* @param currentIndex 选中索引
*/
handlePreviewImage(dataList, currentIndex) {
+ // console.log(dataList)
+ // dataList = dataList.map(item=>{
+ // item=this.$baseURL+item
+ // })
uni.previewImage({
current: dataList[currentIndex],
urls: dataList
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
index 9790cc6..0169769 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
@@ -131,9 +131,11 @@
if(this.fileList.length>0){
this.commentImgsFlag = true
for(let i=0;i
{
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue
index d5e9794..cf3347a 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue
@@ -6,7 +6,7 @@
-
+
@@ -19,7 +19,7 @@
{{commentVOList.comment}}
-
+
@@ -27,13 +27,13 @@
-
+
-
+
@@ -162,11 +162,11 @@
let imgsArray = [];
if (type === 1) {
for (let i = 0; i < this.imageList.length - 1; i++) {
- imgsArray.push(this.imageList[i]);
+ imgsArray.push(this.$baseURL+this.imageList[i]);
}
} else {
for (let i = 0; i < this.imgDataResult.length - 1; i++) {
- imgsArray.push(this.imgDataResult[i]);
+ imgsArray.push(this.$baseURL+this.imgDataResult[i]);
}
}
console.log(imgsArray, 'imgs')
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue b/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue
index 7366859..d5842c0 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRefund.vue
@@ -14,7 +14,7 @@
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRetund.vue b/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRetund.vue
index d90ce33..6e8afae 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRetund.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApplyRetund.vue
@@ -11,7 +11,7 @@
-
{{ item.productName }}
diff --git a/ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue b/ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue
index 0b526c8..8fdfdcc 100644
--- a/ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue
+++ b/ceres-uniapp-master/pages_category_page2/orderModule/afterSale.vue
@@ -20,7 +20,7 @@
-
+
{{itemlist.productName}}
{{itemlist.value}}
diff --git a/ceres-uniapp-master/pages_category_page2/orderModule/refundDetails.vue b/ceres-uniapp-master/pages_category_page2/orderModule/refundDetails.vue
index 419e6d1..25b9ebd 100644
--- a/ceres-uniapp-master/pages_category_page2/orderModule/refundDetails.vue
+++ b/ceres-uniapp-master/pages_category_page2/orderModule/refundDetails.vue
@@ -133,7 +133,7 @@
-
+
{{item.productName}}
{{item.value}}
diff --git a/ceres-uniapp-master/pages_category_page2/orderModule/returnDetails.vue b/ceres-uniapp-master/pages_category_page2/orderModule/returnDetails.vue
index 396a279..898799a 100644
--- a/ceres-uniapp-master/pages_category_page2/orderModule/returnDetails.vue
+++ b/ceres-uniapp-master/pages_category_page2/orderModule/returnDetails.vue
@@ -161,7 +161,7 @@
-
+
{{item.productName}}
{{item.value}}
diff --git a/ceres-uniapp-master/unpackage/dist/build/web.zip b/ceres-uniapp-master/unpackage/dist/build/web.zip
index ad95355..5839504 100644
Binary files a/ceres-uniapp-master/unpackage/dist/build/web.zip and b/ceres-uniapp-master/unpackage/dist/build/web.zip differ
diff --git a/ceres-uniapp-master/unpackage/dist/build/web/index.html b/ceres-uniapp-master/unpackage/dist/build/web/index.html
index de48eea..20b38c0 100644
--- a/ceres-uniapp-master/unpackage/dist/build/web/index.html
+++ b/ceres-uniapp-master/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
在线商城
\ No newline at end of file
+ document.write('')