重新打包

msb_beta
ch 2 years ago
parent 2588ec2a5b
commit 1514e86595

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-29 17:38:17
* @LastEditors: ch
* @LastEditTime: 2022-04-08 15:43:29
* @LastEditTime: 2022-04-11 18:00:46
* @Description: file content
*/
import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@ -46,13 +46,13 @@ export const ApiPostSubmitOrder = (data) =>
* @param {*} data
*/
export const ApiPutCancelOrder = (data) =>
ToAsyncAwait(MsbRequestTkTk.post(`${BASE_URL}/app/tradeOrder/cancel`, data));
ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/app/tradeOrder/cancel`, data));
/**
* 获取支付参数
* @param {*} data
*/
export const ApiPostWxPay = (data) =>
ToAsyncAwait(MsbRequestTkTk.post(`${BASE_URL}/pay/wxPay/app`, data));
ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/wxPay/app`, data));

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-17 17:42:32
* @LastEditors: ch
* @LastEditTime: 2022-04-08 09:56:57
* @LastEditTime: 2022-04-11 18:42:53
* @Description: 项目接口请求统一处理器返回一个需要token和不需要token的请求封装方法
*/
@ -12,7 +12,7 @@ import $store from '@/common/store';
const ENV = 'test';
const BASE_URL = {
// 'test' : 'http://39.103.236.147/api',
'test' : '',
'test' : 'http://k8s-horse-gateway.mashibing.cn',
'release' : '',
'prod' : ''
};

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.a572362a.js></script><script src=/static/js/index.5e995dc1.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.a572362a.js></script><script src=/static/js/index.40e7cde6.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-cart"],{"0ba2":function(n,t,a){"use strict";var e=a("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=e(a("734f")),c={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=c},"0ddb":function(n,t,a){var e=a("24fb");t=e(!1),t.push([n.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场https://ext.dcloud.net.cn上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者建议你使用scss预处理并在插件代码中直接使用这些变量无需 import 这个文件方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者插件使用者你可以通过修改这些变量来定制自己的插件主题实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */uni-page-body[data-v-529a9cda]{background:#f5f5f5;padding-bottom:%?120?%}body.?%PAGE?%[data-v-529a9cda]{background:#f5f5f5}',""]),n.exports=t},"4a3c":function(n,t,a){"use strict";var e=a("c267"),r=a.n(e);r.a},b408:function(n,t,a){"use strict";var e;a.d(t,"b",(function(){return r})),a.d(t,"c",(function(){return c})),a.d(t,"a",(function(){return e}));var r=function(){var n=this,t=n.$createElement,a=n._self._c||t;return a("PageCtx",{ref:"page",staticClass:"page",attrs:{type:"inner"}})},c=[]},c267:function(n,t,a){var e=a("0ddb");"string"===typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);var r=a("4f06").default;r("1edb3d4a",e,!0,{sourceMap:!1,shadowMode:!1})},e81f:function(n,t,a){"use strict";a.r(t);var e=a("0ba2"),r=a.n(e);for(var c in e)"default"!==c&&function(n){a.d(t,n,(function(){return e[n]}))}(c);t["default"]=r.a},f662:function(n,t,a){"use strict";a.r(t);var e=a("b408"),r=a("e81f");for(var c in r)"default"!==c&&function(n){a.d(t,n,(function(){return r[n]}))}(c);a("4a3c");var o,u=a("f0c5"),s=Object(u["a"])(r["default"],e["b"],e["c"],!1,null,"529a9cda",null,!1,e["a"],o);t["default"]=s.exports}}]);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-tabBarCart"],{1266:function(n,t,e){"use strict";e.r(t);var a=e("bcdd"),r=e("fb42");for(var f in r)"default"!==f&&function(n){e.d(t,n,(function(){return r[n]}))}(f);e("9a1ff");var o,u=e("f0c5"),s=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,"761ed496",null,!1,a["a"],o);t["default"]=s.exports},1952:function(n,t,e){var a=e("24fb");t=a(!1),t.push([n.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场https://ext.dcloud.net.cn上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者建议你使用scss预处理并在插件代码中直接使用这些变量无需 import 这个文件方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者插件使用者你可以通过修改这些变量来定制自己的插件主题实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */uni-page-body[data-v-761ed496]{background:#f5f5f5;padding-bottom:%?240?%}body.?%PAGE?%[data-v-761ed496]{background:#f5f5f5}',""]),n.exports=t},"26d2":function(n,t,e){var a=e("1952");"string"===typeof a&&(a=[[n.i,a,""]]),a.locals&&(n.exports=a.locals);var r=e("4f06").default;r("73cf590f",a,!0,{sourceMap:!1,shadowMode:!1})},"9a1ff":function(n,t,e){"use strict";var a=e("26d2"),r=e.n(a);r.a},bcdd:function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return f})),e.d(t,"a",(function(){return a}));var r=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("PageCtx",{ref:"page",staticClass:"page",attrs:{type:"tabBar"}})},f=[]},e625:function(n,t,e){"use strict";var a=e("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=a(e("734f")),f={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=f},fb42:function(n,t,e){"use strict";e.r(t);var a=e("e625"),r=e.n(a);for(var f in a)"default"!==f&&function(n){e.d(t,n,(function(){return a[n]}))}(f);t["default"]=r.a}}]);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-order-saleAfter-saleAfterApplication"],{"0a2e":function(t,e,n){"use strict";n.r(e);var a=n("44f7"),i=n.n(a);for(var l in a)"default"!==l&&function(t){n.d(e,t,(function(){return a[t]}))}(l);e["default"]=i.a},"3f3b":function(t,e,n){"use strict";var a=n("f9ea"),i=n.n(a);i.a},"44f7":function(t,e,n){"use strict";var a=n("4ea4");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=a(n("f196")),l={components:{UiCell:i.default}};e.default=l},"59a3":function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return l})),n.d(e,"a",(function(){return a}));var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"uiCell",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.$emit("click")}}},[t._t("icon"),a("v-uni-view",{staticClass:"uiCell--left"},[a("v-uni-text",{staticClass:"uiCell--title"},[t._v(t._s(t.title))]),a("v-uni-text",{staticClass:"uiCell--label"},[t._v(t._s(t.label))])],1),t._t("value",[a("v-uni-text",{staticClass:"uiCell--value"},[t._v(t._s(t.value))])]),t.rightIcon?t._t("right-icon",[a("v-uni-image",{staticClass:"uiCell--rightIcon",attrs:{src:n("6eb6")}})]):t._e()],2)},l=[]},"6eb6":function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAUCAMAAACDMFxkAAAAAXNSR0IArs4c6QAAAGZQTFRFAAAAv7+/v7+/ysrKxsbGy8vLzMzM0NDQy8vLz8/PzMzMysrKzMzMy8vLzMzMy8vLy8vLzc3Ny8vLzMzMzMzMy8vLzc3Nzc3NzMzMzMzMzMzMy8vLzMzMzMzMzMzMy8vLzMzMzMzMIxnl6wAAACF0Uk5TAAQMGCQnKCssOzxIS09QU1RXWG+Dj4+nv9PX5+fv8/v73LQA2wAAAF9JREFUCNdlz0kWgCAMA1Cc5xEHQCz0/pd0IdH3tKu/SlKh90iEU7yCseYFTgxLOLU8wfnpOrgmquDGUwGP/shgyebPgW1+q3VU3qqI6lBBvg+yPH/nxOYZqXhD9vvQBZbIBgiaTuluAAAAAElFTkSuQmCC"},"8eac":function(t,e,n){"use strict";n.r(e);var a=n("c04a"),i=n.n(a);for(var l in a)"default"!==l&&function(t){n.d(e,t,(function(){return a[t]}))}(l);e["default"]=i.a},abd3:function(t,e,n){var a=n("24fb");e=a(!1),e.push([t.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场https://ext.dcloud.net.cn上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者建议你使用scss预处理并在插件代码中直接使用这些变量无需 import 这个文件方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者插件使用者你可以通过修改这些变量来定制自己的插件主题实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */.uiCell[data-v-4ba2f3f6]{min-height:%?100?%;border-bottom:1px solid #eee;display:flex;justify-content:space-between;align-items:center;background:#fff}.uiCell--title[data-v-4ba2f3f6]{color:#333;font-size:%?28?%;display:block}.uiCell--label[data-v-4ba2f3f6]{color:#999;font-size:%?24?%;display:block;margin-top:%?10?%}.uiCell--value[data-v-4ba2f3f6]{flex:1;padding:0 %?10?%;text-align:right;font-size:%?28?%}.uiCell--rightIcon[data-v-4ba2f3f6]{width:%?10?%;height:%?20?%;margin-left:%?18?%}',""]),t.exports=e},c04a:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={props:{title:{type:String,default:""},label:{type:String,default:""},value:{type:String,default:""},rightIcon:{type:Boolean,default:!0}}};e.default=a},c45e:function(t,e,n){"use strict";n.r(e);var a=n("e1a9"),i=n("0a2e");for(var l in i)"default"!==l&&function(t){n.d(e,t,(function(){return i[t]}))}(l);var u,r=n("f0c5"),s=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,"731540ba",null,!1,a["a"],u);e["default"]=s.exports},e1a9:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return l})),n.d(e,"a",(function(){return a}));var i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",[n("v-uni-view",[n("UiCell",{attrs:{title:"货物状态"}}),n("UiCell",{attrs:{title:"退款原因"}}),n("UiCell",{attrs:{title:"退款金额"}}),n("UiCell",{attrs:{title:"问题描述"}})],1),n("v-uni-view")],1)},l=[]},f196:function(t,e,n){"use strict";n.r(e);var a=n("59a3"),i=n("8eac");for(var l in i)"default"!==l&&function(t){n.d(e,t,(function(){return i[t]}))}(l);n("3f3b");var u,r=n("f0c5"),s=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,"4ba2f3f6",null,!1,a["a"],u);e["default"]=s.exports},f9ea:function(t,e,n){var a=n("abd3");"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var i=n("4f06").default;i("d85769a6",a,!0,{sourceMap:!1,shadowMode:!1})}}]);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -148,12 +148,14 @@
},
{
"path": "pages/order/paySuccess",
"aliasPath" : "/paySuccess",
"style": {
"navigationBarTitleText": "支付成功"
}
},
{
"path": "pages/order/payFail",
"aliasPath" : "/payFail",
"style": {
"navigationBarTitleText": "支付失败"
}
@ -162,7 +164,7 @@
"path": "pages/order/saleAfter/saleAfterApplication",
"aliasPath" : "/saleAfterApplication",
"style": {
"navigationBarTitleText": "支付失败"
"navigationBarTitleText": "申请退款"
}
},
{

@ -25,7 +25,7 @@
<view class="cart-item" v-for="(item, index) in list" :key="index"
@click="$Router.push(`goodsDetail?id=${item.id}`)">
<label class="cart-item--radio" @click.stop="handleCheckItem(item.id)">
<radio class="radio" color="$color-yellow3"
<radio class="radio" color="#FF875B"
:checked="checkedIds.length ? checkedIds.includes(item.id) : false" />
</label>
<image class="cart-item--image" :src="item.product.mainPicture" mode="scaleToFill"></image>
@ -61,7 +61,7 @@
<!-- 底部操作栏 -->
<view v-if="list.length" :class="`footer footer__${type}`">
<label class="all-radio" @click="handleCheckAll">
<radio class="radio" color="$color-yellow3"
<radio class="radio" color="#FF875B"
:checked="checkedIds.length > 0 && checkedIds.length === list.length" />
<text>全选</text>
</label>

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-31 14:26:09
* @LastEditors: ch
* @LastEditTime: 2022-04-11 11:28:36
* @LastEditTime: 2022-04-11 16:53:15
* @Description: file content
-->
<template>
@ -11,7 +11,7 @@
<UiWhiteBox>
<UiGoodsInfo v-for="(item, index) in orderInfo.products" :data="item" :key="index">
<template slot="operation">
<UiButton>申请售</UiButton>
<UiButton @click="$Router.push('/saleAfterApplication')"></UiButton>
</template>
</UiGoodsInfo>
</UiWhiteBox>

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-28 17:16:44
* @LastEditors: ch
* @LastEditTime: 2022-03-28 17:45:51
* @LastEditTime: 2022-04-11 18:05:06
* @Description: file content
-->
<template>
@ -11,8 +11,8 @@
<view class="title">支付成功</view>
<view class="desc">您的包裹整装待发</view>
<view class="btns">
<UiButton class="btn" type="primaryLine">返回首</UiButton>
<UiButton class="btn" type="solid">查看订</UiButton>
<UiButton class="btn" type="primaryLine" @click="$Router.replaceAll('/')"></UiButton>
<UiButton class="btn" type="solid" @click="$Router.replace(`/orderDetail?id=${$Route.query.ordId}`)"></UiButton>
</view>
</view>
</template>

@ -2,28 +2,56 @@
* @Author: ch
* @Date: 2022-04-11 13:51:10
* @LastEditors: ch
* @LastEditTime: 2022-04-11 16:14:37
* @LastEditTime: 2022-04-11 17:23:00
* @Description: file content
-->
<template>
<view>
<view>
<view class="box">
<UiCell title="货物状态"></UiCell>
<UiCell title="退款原因"></UiCell>
<UiCell title="退款金额"></UiCell>
<UiCell title="问题描述"></UiCell>
</view>
<view>
<view class="box">
<u-upload
:fileList="fileList3"
@afterRead="afterRead"
@delete="deletePic"
name="3"
multiple
:maxCount="10"
:previewFullImage="true"
></u-upload>
</view>
<UiButton size="max" type="gradual">提交申请</UiButton>
</view>
</template>
<script>
import UiCell from '../../../components/UiCell.vue'
import UiButton from '../../../components/UiButton.vue';
import UiCell from "../../../components/UiCell.vue";
export default {
components: { UiCell },
}
components: { UiCell, UiButton },
data() {
return {
fileList3: [
{
url: "https://cdn.uviewui.com/uview/swiper/1.jpg",
},
],
};
},
};
</script>
<style lang="scss">
page{
background: $color-grey1;
}
</style>
<style lang="scss" scoped>
.box{
padding: 0 40rpx;
margin: 20rpx 0;
background: $color-grey0;
}
</style>

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-20 14:14:53
* @LastEditors: ch
* @LastEditTime: 2022-04-09 15:03:54
* @LastEditTime: 2022-04-11 18:08:06
* @Description: file content
-->
<template>
@ -40,11 +40,11 @@
<radio-group>
<u-cell title="微信支付" :border="false">
<image class="play--icon" slot="icon" src="@/static/order/wx.png"/>
<radio class="play--radio" slot="right-icon" color="$color-yellow3"></radio>
<radio class="play--radio" slot="right-icon" color="#FF875B"></radio>
</u-cell>
<u-cell title="支付宝支付" :border="false">
<image class="play--icon" slot="icon" src="@/static/order/zfb.png"/>
<radio class="play--radio" slot="right-icon" color="$color-yellow3"></radio>
<radio class="play--radio" slot="right-icon" color="#FF875B"></radio>
</u-cell>
</radio-group>
</view>
@ -141,6 +141,11 @@ export default {
},
async wxpay(orderId){
const {error, result} = await ApiPostWxPay({orderId});
if(error){
this.$Router.push(`/payFail?ordId=${orderId}`)
}else{
this.$Router.push(`/paySuccess?ordId=${orderId}`)
}
}
}

Loading…
Cancel
Save