zcdsj
/
shuinishop
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

limitedNum

This commit is contained in:
shijing 2022-06-24 08:36:15 +08:00
parent b2e3ed094b
commit 8af970ce6d
10 changed files with 221 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
.idea/workspace.xml
View File

@ -2,9 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d92a373b-a34b-42e4-9751-2d18d522a715" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/common/http.api.js" beforeDir="false" afterPath="$PROJECT_DIR$/common/http.api.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/order/confirmation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order/confirmation.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/pay/payment/uppayment.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/pay/payment/uppayment.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/App.vue" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
@ -16,7 +14,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/App.vue">
<provider selected="true" editor-type-id="text-editor">
@ -26,20 +24,53 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/info.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="-1963" />
<second_editor />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/manifest.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1078" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-10348" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/common/http.api.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/user/setting/setting.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<state relative-caret-position="3210">
<caret line="107" column="42" selection-start-line="107" selection-start-column="42" selection-end-line="107" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/tabBar/user/user.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="370">
<caret line="190" column="18" lean-forward="true" selection-start-line="190" selection-start-column="18" selection-end-line="190" selection-end-column="18" />
<state relative-caret-position="190">
<caret line="184" column="10" selection-start-line="184" selection-start-column="10" selection-end-line="184" selection-end-column="10" />
</state>
</provider>
</entry>
@ -49,6 +80,7 @@
<component name="FindInProjectRecents">
<findStrings>
<find>vuex_user</find>
<find>appSecret</find>
</findStrings>
<replaceStrings>
<replace />
@ -57,6 +89,13 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/pages/tabBar/user/user.vue" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-2204" />
<option name="y" value="163" />
@ -76,11 +115,37 @@
<item name="shuinishop" type="b2602c69:ProjectViewProjectNode" />
<item name="shuinishop" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="shuinishop" type="b2602c69:ProjectViewProjectNode" />
<item name="shuinishop" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="shuinishop" type="b2602c69:ProjectViewProjectNode" />
<item name="shuinishop" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="shuinishop" type="b2602c69:ProjectViewProjectNode" />
<item name="shuinishop" type="462c0819:PsiDirectoryNode" />
<item name="static" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="shuinishop" type="b2602c69:ProjectViewProjectNode" />
<item name="shuinishop" type="462c0819:PsiDirectoryNode" />
<item name="unpackage" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="shuinishop" type="b2602c69:ProjectViewProjectNode" />
<item name="shuinishop" type="462c0819:PsiDirectoryNode" />
<item name="unpackage" type="462c0819:PsiDirectoryNode" />
<item name="dist" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="shuinishop" type="b2602c69:ProjectViewProjectNode" />
<item name="shuinishop" type="462c0819:PsiDirectoryNode" />
<item name="uview-ui" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
@ -89,7 +154,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../hberp/hb_client" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
</component>
@ -116,22 +181,20 @@
<option name="presentableId" value="Default" />
<updated>1639965828906</updated>
<workItem from="1639965830415" duration="2224000" />
<workItem from="1650788678780" duration="698000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2224000" />
<option name="totallyTimeSpent" value="2922000" />
</component>
<component name="ToolWindowManager">
<frame x="-2568" y="-8" width="2576" height="1416" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24980299" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
@ -139,6 +202,10 @@
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Terminal" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@ -148,6 +215,20 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/user/setting/setting.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3210">
<caret line="107" column="42" selection-start-line="107" selection-start-column="42" selection-end-line="107" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/tabBar/user/user.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="184" column="10" selection-start-line="184" selection-start-column="10" selection-end-line="184" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/App.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
@ -155,17 +236,55 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/user/setting/setting.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="107" column="42" selection-start-line="107" selection-start-column="42" selection-end-line="107" selection-end-column="42" />
<entry file="file://$PROJECT_DIR$/info.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="-1963" />
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/tabBar/user/user.vue">
<entry file="file://$PROJECT_DIR$/manifest.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="370">
<caret line="190" column="18" lean-forward="true" selection-start-line="190" selection-start-column="18" selection-end-line="190" selection-end-column="18" />
<state relative-caret-position="-1078" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-10348" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/vue-i18n.min.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/richTextUtil.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-88">
<folding>
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/http.interceptor.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1318">
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/http.api.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
</state>
</provider>
</entry>

1
common/SDK/amap-wx.js
View File

File diff suppressed because one or more lines are too long

2
common/http.api.js
View File

@ -36,6 +36,7 @@ const install = (Vue, vm) => {
let addOrder = (params={})=>vm.$u.post('/index.php/api/car/submit', params);
let getFreight = (params={})=>vm.$u.post(`/index.php/api/car/get_freight/shop_uid`,params);//获取商家免运费价格
let getOrders = (params={})=>vm.$u.get('index.php/api/order/index', params);//我的订单
let orderDetail = (id)=>vm.$u.get(`/index.php/api/order/show/id/${id}`);//我的订单详情
let qxdd = (id)=>vm.$u.get(`index.php/api/order/cancel_order/id/${id}`);//取消订单
let qrsh = (id)=>vm.$u.get(`/index.php/api/order/confirm/id/${id}`);//收货确认
let qrfp = (id)=>vm.$u.get(`/index.php/api/order/invoice_confirm/id/${id}`);//发票确认
@ -75,6 +76,7 @@ const install = (Vue, vm) => {
addOrder,
getFreight,
getOrders,
orderDetail,
qrsh,
qrfp,
tjkp,

1
manifest.json
View File

@ -61,7 +61,6 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
/* 小程序特有相关 */
"appid" : "wxe27470b2f09a2508",
"setting" : {
"urlCheck" : false

2
pages.json
View File

@ -9,7 +9,7 @@
"onReachBottomDistance":50,
"app-plus": {
"titleNView": false ,//禁用原生导航栏
"softinputNavBar":"none",
// "softinputNavBar":"none",
"subNVues":[{
"id": "homeTitleNvue", // 唯一标识
"path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径

16
pages/goods/goods.vue
View File

@ -116,7 +116,7 @@
<view class="icon jian"></view>
</view>
<view class="input" @tap.stop="discard">
<input type="number" v-model="good._num" />
<input @input="numInput" type="number" v-model="good._num" />
</view>
<view class="add" @tap.stop="add">
<view class="icon jia"></view>
@ -447,7 +447,19 @@
},
//增加数量
add() {
if(this.good._num>499){
return;
}else{
this.good._num++;
}
},
numInput() {
setTimeout(() => {
if(this.good._num>500){
this.good._num = 500;
}
}, 0)
},
//跳转锚点
toAnchor(index) {
@ -535,7 +547,7 @@
}
},
discard() {
//丢弃
}
}
};

16
pages/tabBar/cart/cart.vue
View File

@ -42,7 +42,7 @@
<view class="icon jian"></view>
</view>
<view class="input" @tap.stop="discard">
<input type="number" v-model="row._num" @input="sum($event,index)" />
<input type="number" v-model="row._num" @input="numInput(index)" />
</view>
<view class="add" @tap.stop="add(index)">
<view class="icon jia"></view>
@ -330,11 +330,25 @@
},
// 增加数量
add(index){
if(this.goodsList[index]._num>499){
// this.sum();
}else{
this.goodsList[index]._num++;
this.sum();
}
},
numInput(index) {
setTimeout(() => {
if(this.goodsList[index]._num>500){
this.goodsList[index]._num=500;
}
this.sum();
}, 0)
},
// 合计
sum(e,index){
this.sumPrice=0;
let len = this.goodsList.length;
for(let i=0;i<len;i++){

2
pages/tabBar/home/home.vue
View File

@ -116,7 +116,7 @@
<script>
var ttt = 0;
//高德SDK
import amap from '@/common/SDK/amap-wx.js';
// import amap from '@/common/SDK/amap-wx.js';
export default {
data() {
return {

46
pages/user/order_list/orderDetail.vue
View File

@ -34,10 +34,9 @@
</view>
<view class="block">
<view class="marginBottom20"><view class="grayColor">订单编号:</view>{{row.order_sn}}</view>
<view><view class="grayColor">下单时间:</view>{{row.create_time}}</view>
<!-- <view v-if="hasLogs"><view class="grayColor">物流信息:</view>{{logistics}}</view>
<view v-if="row.shipping_status==1&&!hasLogs" class="viewLogistics" @click="viewLogistic">查看物流信息</view>
-->
<view class="marginBottom20"><view class="grayColor">下单时间:</view>{{row.create_time}}</view>
<view v-if="row.shipping_name!==''" class="marginBottom20"><view class="grayColor">物流公司:</view>{{row.shipping_name}}</view>
<view v-if="row.shipping_code!==''"><view class="grayColor">物流单号:</view>{{row.shipping_code}}</view>
</view>
<view class="block">
<view :class="[row.if_invoice!==0?'marginBottom20':'']"><view class="grayColor">发票类型:</view> <text v-if="row.if_invoice==0">无</text> <text v-else-if="row.if_invoice==1">普票</text> <text v-else>专票</text></view>
@ -79,20 +78,37 @@
hasLogs:false,
};
},
onLoad(e) {
uni.getStorage({
key: 'orderDetail',
success: (res) => {
// debugger;
let row = JSON.parse(res.data);
this.row = row;
this.goodMoney = (row.totalmoney-row.real_freight).toFixed(2)
this.url = this.vuex_host +
'index.php/index/attachment/upload?dir=images&from=base64&module=index'
onLoad(option) {
debugger
console.log("option: "+ option.orderId)
this.orderId = parseInt(option.orderId);
//兼容H5下排序栏位置
// #ifdef H5
let Timer = setInterval(()=>{
let uniHead = document.getElementsByTagName('uni-page-head');
if(uniHead.length>0){
this.headerTop = uniHead[0].offsetHeight+'px';
clearInterval(Timer);//清除定时器
}
})
},1);
// #endif
},
onShow(){
this.getOrderDetail()
},
methods: {
getOrderDetail(){
debugger;
var that = this;
that.$u.api.orderDetail(that.orderId).then(res=>{
that.row = res.data;
that.goodMoney = (that.row.totalmoney-that.row.real_freight).toFixed(2)
that.url = that.vuex_host +
'index.php/index/attachment/upload?dir=images&from=base64&module=index'
})
},
toGoods(row) {
uni.navigateTo({
url: '../../goods/goods?id='+row.id

20
pages/user/order_list/order_list.vue
View File

@ -40,18 +40,18 @@
</view>
</view>
<view>{{row.shop_db[0].username}}</view>
<view class="order-info" v-for="row in row.shop_db" v-bind:key="row.id" @click="orderDetail(row,index)">
<view class="order-info" v-for="item in row.shop_db" v-bind:key="item.id" @click="orderDetail(row,index)">
<view class="left">
<image :src="row.picurl"></image>
<image :src="item.picurl"></image>
</view>
<view class="right">
<view class="name">
{{row.full_title}}
{{item.full_title}}
</view>
<!-- <view class="spec">{{row.spec}}</view> -->
<view class="price-number">
￥<view class="price">{{row._price}}</view>
x<view class="number">{{row._num}}</view>
￥<view class="price">{{item._price}}</view>
x<view class="number">{{item._num}}</view>
</view>
</view>
@ -333,8 +333,12 @@
uni.showLoading({
title:'正在获取订单...'
})
debugger;
console.log(row)
setTimeout(()=>{
uni.setStorage({
uni.setStorageSync('orderId',row.id);
uni.navigateTo({url:'./orderDetail?orderId='+row.id})
/* uni.setStorage({
key:'orderDetail',
data:JSON.stringify(this.list[index]),
success: () => {
@ -343,8 +347,8 @@
url:'./orderDetail'
})
}
})
},500)
}) */
},100)
}
}
}