panxiaohe
/
ceres-pc-v2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加分账功能

master
xh-pan1 2 years ago
parent
0ae68a541c
commit
f359f6882b
8 changed files with 21 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      index.html
  2. 6
      src/components/base/footer.vue
  3. 1
      src/components/base/secondNav.vue
  4. 8
      src/util/server.js
  5. 27
      src/views/afterSale/index.vue
  6. 2
      src/views/orderDetail/components/submit.vue
  7. 0
      static/thee.ico

2
index.html
View File

@ -6,7 +6,7 @@
<meta HTTP-EQUIV ="pragma" CONTENT="no-cache">
<meta http-equiv="Cache-Control"CONTENT="no-cache, must-revalidate">
<meta http-equiv="expires"CONTENT="0">
<link rel="icon" type="image/x-icon" href="static/cereshop.ico">
<link rel="icon" type="image/x-icon" href="static/thee.ico">
<title>Thee商城</title>
</head>
<body>

6
src/components/base/footer.vue
View File

@ -9,7 +9,7 @@
<div class="consult">咨询客服</div>
</div>
<div class="centerBox">
<p class="title">关注CERESHOP</p>
<p class="title">关注Thee</p>
<p>专注于客单价，转化率提升！</p>
<p>便捷高效，助力各大商家提升客单价，</p>
<p>客户引导，提高复购，</p>
@ -23,12 +23,12 @@
<p class="cur-poi">联系我们</p>
</div>
<div class="qrCode">
<p class="title">下载CERESHOP</p>
<p class="title">下载Thee</p>
<img src="../../../static/image/qrcode.png" alt="">
</div>
</div>
</div>
<p class="bottom">&copy;2017-2021CERESHOP版权所有，并保留所有权利 粤ICP备19086489号-3</p>
<p class="bottom">&copy;2017-2021Thee版权所有，并保留所有权利 粤ICP备19086489号-3</p>
</div>
</div>
</template>

1
src/components/base/secondNav.vue
View File

@ -83,7 +83,6 @@ export default {
height: 20px;
}
}
}
.search{
width: 394px;

8
src/util/server.js
View File

@ -7,11 +7,11 @@ import store from '@/store/index'
import Cookie from 'js-cookie'
promise.polyfill()
// export const baseURL = (process.env.NODE_ENV === 'production') ? 'http://122.9.152.120/ceres-app-api' : '/api'
// export const uploadURL = 'http://122.9.152.120/ceres-app-api/api'
export const baseURL = (process.env.NODE_ENV === 'production') ? 'http://122.9.152.120/ceres-app-api' : '/api'
export const uploadURL = 'http://122.9.152.120/ceres-app-api/api'
export const baseURL = (process.env.NODE_ENV === 'production') ? 'https://wechat.hnthee.com/ceres-app-api' : '/api'
export const uploadURL = 'https://wechat.hnthee.com/ceres-app-api/api'
// export const baseURL = (process.env.NODE_ENV === 'production') ? 'https://wechat.hnthee.com/ceres-app-api' : '/api'
// export const uploadURL = 'https://wechat.hnthee.com/ceres-app-api/api'
const service = axios.create({
baseURL,

27
src/views/afterSale/index.vue
View File

@ -28,24 +28,21 @@
<p class="fs24 fw-blod font-color-999" v-if="orderData.afterState===8">退货完成，拒绝退款</p>
<p class="fs24 fw-blod font-color-999" v-if="orderData.afterState===9">已关闭</p>
<p class="fs24 fw-blod" v-if="orderData.afterState===10">审核通过</p>
<el-button plain
v-if="orderData.afterState===6 || orderData.afterState===8"
class="intervention mar-top-10"
@click="platform"
>申请平台介入</el-button>
<el-button plain
v-if="(orderData.afterState===1 && orderData.afterType===1)
<el-button plain v-if="orderData.afterState===6 || orderData.afterState===8"
class="intervention mar-top-10" type="info" @click="platform">
申请平台介入
</el-button>
<el-button plain v-if="(orderData.afterState===1 && orderData.afterType===1)
|| (orderData.afterState===6 && orderData.afterType===1)
|| (orderData.afterState===10 && orderData.afterType===1)"
class="intervention mar-top-10"
@click="returnRefund"
>撤销申请</el-button>
<el-button plain
v-if="orderData.afterState===1 && orderData.afterType===2
class="intervention mar-top-10" type="info" @click="returnRefund">
撤销申请
</el-button>
<el-button plain v-if="orderData.afterState===1 && orderData.afterType===2
|| orderData.afterState===6 && orderData.afterType===2"
class="intervention mar-top-10"
@click="returnGoods"
>撤销退货</el-button>
class="intervention mar-top-10" type="info" @click="returnGoods">
撤销退货
</el-button>
</div>
</div>
<div class="bottom">

2
src/views/orderDetail/components/submit.vue
View File

@ -68,7 +68,7 @@
</el-upload>
</div>
<div class="submit">
<el-button plain @click="submit" v-throttle>提交申请</el-button>
<el-button type="info" plain @click="submit" v-throttle>提交申请</el-button>
</div>
</div>
</template>

0
static/cereshop.ico → static/thee.ico
View File

Write Preview
Loading…
Cancel
Save