Skip to content

肖康 / H5_2.0

Go to a project
Commit 40f3e398 by LJM
Options

Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

parents 2f867b20 7be471b2
Expand all
Inline Side-by-side
Showing with 212 additions and 16 deletions
assets/css/confirm/confirm.scss
......@@ -125,18 +125,10 @@
border-radius: 32rpx;
border:1rpx solid #c2c4cc;
}
.icon-xzs{
color:$uni-coloract;
display: none;
}
&.act{
.icon-xzs{
display: flex;
}
.noxz{
display: none;
}
.icon-jt{
color:$uni-color999;
}
}
.ztperson{
.nppinfo{
......@@ -170,6 +162,62 @@
}
.fpbox{
padding:24rpx;
background: #fff;
margin-top: 16rpx;
.icon-fpp{
font-size: 40rpx;
color:$uni-coloract;
margin-right: 16rpx;
&.nofp{color:$uni-color999;}
}
.itemcen{
color:$uni-color999;
font-size: 24rpx;
width:600rpx;
}
.icon-jt{
color:$uni-color999;
}
.iteminfo{
width:600rpx;
.infot{
font-size: 28rpx;
font-weight: 600;
color:$uni-color333;
text{
width: 76rpx;
height: 34rpx;
background: #FFFFFF;
border-radius: 17rpx;
border: 1rpx solid #C6C7CC;
color:$uni-color999;
font-size: 22rpx;
text-align: center;
margin-left: 16rpx;
font-weight: normal;
}
}
.infopeo{
font-size: 24rpx;
font-weight: 400;
color:$uni-color666;
margin-top: 8rpx;
text{margin-right: 24rpx;}
}
.infob{
margin-top: 8rpx;
font-size: 24rpx;
font-weight: 400;
color:$uni-color999;
line-height: 33rpx;
}
}
}
.htbox{
margin-top: 16rpx;
height: 178rpx;
......@@ -192,6 +240,8 @@
margin-top: 20rpx;
}
}
.goodsbox{
margin-top: 16rpx;
padding:24rpx;
......
package-lock.json
{
"name": "h5_2.0",
"version": "1.0.0",
"lockfileVersion": 1,
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "h5_2.0",
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"jweixin-module": "^1.6.0",
"lodash": "^4.17.21",
"query-string": "^6.14.1",
"uni-simple-router": "^1.5.5"
}
},
"node_modules/jweixin-module": {
"version": "1.6.0",
"resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
},
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://repo.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"node_modules/query-string": {
"version": "6.14.1",
"resolved": "https://registry.npmmirror.com/query-string/-/query-string-6.14.1.tgz",
"integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
"dependencies": {
"decode-uri-component": "^0.2.0",
"filter-obj": "^1.1.0",
"split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0"
},
"engines": {
"node": ">=6"
}
},
"node_modules/query-string/node_modules/decode-uri-component": {
"version": "0.2.2",
"resolved": "https://repo.huaweicloud.com/repository/npm/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
"engines": {
"node": ">=0.10"
}
},
"node_modules/query-string/node_modules/filter-obj": {
"version": "1.1.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/filter-obj/-/filter-obj-1.1.0.tgz",
"integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/query-string/node_modules/split-on-first": {
"version": "1.1.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/split-on-first/-/split-on-first-1.1.0.tgz",
"integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
"engines": {
"node": ">=6"
}
},
"node_modules/query-string/node_modules/strict-uri-encode": {
"version": "2.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
"engines": {
"node": ">=4"
}
},
"node_modules/uni-simple-router": {
"version": "1.5.5",
"resolved": "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-1.5.5.tgz",
"integrity": "sha512-VjBnwhvmWYHVNsj2zcPjYBwb9TqG7miR87qLBBLI4gHOnJVYmCyjZK/bj06f9slvTMbWXrze7LJ9/Hi/8DB0ag==",
"hasInstallScript": true,
"dependencies": {
"query-string": "^6.12.1"
}
},
"node_modules/uni-simple-router/node_modules/decode-uri-component": {
"version": "0.2.2",
"resolved": "https://repo.huaweicloud.com/repository/npm/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
"engines": {
"node": ">=0.10"
}
},
"node_modules/uni-simple-router/node_modules/filter-obj": {
"version": "1.1.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/filter-obj/-/filter-obj-1.1.0.tgz",
"integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/uni-simple-router/node_modules/query-string": {
"version": "6.14.1",
"resolved": "https://repo.huaweicloud.com/repository/npm/query-string/-/query-string-6.14.1.tgz",
"integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
"dependencies": {
"decode-uri-component": "^0.2.0",
"filter-obj": "^1.1.0",
"split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0"
},
"engines": {
"node": ">=6"
}
},
"node_modules/uni-simple-router/node_modules/split-on-first": {
"version": "1.1.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/split-on-first/-/split-on-first-1.1.0.tgz",
"integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
"engines": {
"node": ">=6"
}
},
"node_modules/uni-simple-router/node_modules/strict-uri-encode": {
"version": "2.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
"engines": {
"node": ">=4"
}
}
},
"dependencies": {
"jweixin-module": {
"version": "1.6.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/jweixin-module/-/jweixin-module-1.6.0.tgz",
"resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
},
"lodash": {
......
pages/confirm/confirmSuccess.vue
......@@ -20,20 +20,42 @@
<navigator url="/user/shoporder" class="ckorder">查看订单</navigator>
<view class="tsu3 row rowCenter">
<text>订单编号：</text>
<navigator url="/user/orderdetail" class="ckorderdetail">12022071810404SZ</navigator>
<navigator :url="'/user/orderdetail?order_id='+this.obj_.order_id" class="ckorderdetail">{{this.obj_.order_sn}}</navigator>
</view>
</view>
</template>
<script>
import {
Ichunt_Api,
Api_Url
} from '@/util/api.js';
export default {
data() {
return {
kfurl:""
kfurl:"",
obj_:{}
}
},
mounted() {
setTimeout(() => {
this.kfurl = this.$globalData.kfqq_xk;
}, 500);
},
onLoad(option){
console.log(option.order_id)
this.getData(option.order_id);
},
methods: {
getData(order_id){
this.request(Api_Url + '/order/info', 'POST',{order_id:order_id}, true, true).then(res => {
if(res.err_code==0){
this.obj_=res.data
}else{
}
});
}
}
}
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment