From 8af970ce6d340dffb508ed87dc9a6300a3188e85 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 24 Jun 2022 08:36:15 +0800
Subject: [PATCH] limitedNum

---
 .idea/workspace.xml                   | 163 ++++++++++++++++++++++----
 common/SDK/amap-wx.js                 |   1 -
 common/http.api.js                    |   2 +
 manifest.json                         |   1 -
 pages.json                            |   2 +-
 pages/goods/goods.vue                 |  18 ++-
 pages/tabBar/cart/cart.vue            |  20 +++-
 pages/tabBar/home/home.vue            |   2 +-
 pages/user/order_list/orderDetail.vue |  48 +++++---
 pages/user/order_list/order_list.vue  |  20 ++--
 10 files changed, 221 insertions(+), 56 deletions(-)
 delete mode 100644 common/SDK/amap-wx.js

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0666e95..e9165c9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -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>
diff --git a/common/SDK/amap-wx.js b/common/SDK/amap-wx.js
deleted file mode 100644
index eb969c3..0000000
--- a/common/SDK/amap-wx.js
+++ /dev/null
@@ -1 +0,0 @@
-function AMapWX(a){this.key=a.key,this.requestConfig={key:a.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"}}AMapWX.prototype.getWxLocation=function(a,b){wx.getLocation({type:"gcj02",success:function(a){var c=a.longitude+","+a.latitude;wx.setStorage({key:"userLocation",data:c}),b(c)},fail:function(c){wx.getStorage({key:"userLocation",success:function(a){a.data&&b(a.data)}}),a.fail({errCode:"0",errMsg:c.errMsg||""})}})},AMapWX.prototype.getRegeo=function(a){function c(c){var d=b.requestConfig;wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:b.key,location:c,extensions:"all",s:d.s,platform:d.platform,appname:b.key,sdkversion:d.sdkversion,logversion:d.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){var d,e,f,g,h,i,j,k,l;b.data.status&&"1"==b.data.status?(d=b.data.regeocode,e=d.addressComponent,f=[],g="",d&&d.roads[0]&&d.roads[0].name&&(g=d.roads[0].name+"附近"),h=c.split(",")[0],i=c.split(",")[1],d.pois&&d.pois[0]&&(g=d.pois[0].name+"附近",j=d.pois[0].location,j&&(h=parseFloat(j.split(",")[0]),i=parseFloat(j.split(",")[1]))),e.provice&&f.push(e.provice),e.city&&f.push(e.city),e.district&&f.push(e.district),e.streetNumber&&e.streetNumber.street&&e.streetNumber.number?(f.push(e.streetNumber.street),f.push(e.streetNumber.number)):(k="",d&&d.roads[0]&&d.roads[0].name&&(k=d.roads[0].name),f.push(k)),f=f.join(""),l=[{iconPath:a.iconPath,width:a.iconWidth,height:a.iconHeight,name:f,desc:g,longitude:h,latitude:i,id:0,regeocodeData:d}],a.success(l)):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this;a.location?c(a.location):b.getWxLocation(a,function(a){c(a)})},AMapWX.prototype.getWeather=function(a){function d(d){var e="base";a.type&&"forecast"==a.type&&(e="all"),wx.request({url:"https://restapi.amap.com/v3/weather/weatherInfo",data:{key:b.key,city:d,extensions:e,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){function c(a){var b={city:{text:"城市",data:a.city},weather:{text:"天气",data:a.weather},temperature:{text:"温度",data:a.temperature},winddirection:{text:"风向",data:a.winddirection+"风"},windpower:{text:"风力",data:a.windpower+"级"},humidity:{text:"湿度",data:a.humidity+"%"}};return b}var d,e;b.data.status&&"1"==b.data.status?b.data.lives?(d=b.data.lives,d&&d.length>0&&(d=d[0],e=c(d),e["liveData"]=d,a.success(e))):b.data.forecasts&&b.data.forecasts[0]&&a.success({forecast:b.data.forecasts[0]}):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}function e(e){wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:b.key,location:e,extensions:"all",s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion},method:"GET",header:{"content-type":"application/json"},success:function(b){var c,e;b.data.status&&"1"==b.data.status?(e=b.data.regeocode,e.addressComponent?c=e.addressComponent.adcode:e.aois&&e.aois.length>0&&(c=e.aois[0].adcode),d(c)):a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this,c=b.requestConfig;a.city?d(a.city):b.getWxLocation(a,function(a){e(a)})},AMapWX.prototype.getPoiAround=function(a){function d(d){var e={key:b.key,location:d,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.querytypes&&(e["types"]=a.querytypes),a.querykeywords&&(e["keywords"]=a.querykeywords),wx.request({url:"https://restapi.amap.com/v3/place/around",data:e,method:"GET",header:{"content-type":"application/json"},success:function(b){var c,d,e,f;if(b.data.status&&"1"==b.data.status){if(b=b.data,b&&b.pois){for(c=[],d=0;d<b.pois.length;d++)e=0==d?a.iconPathSelected:a.iconPath,c.push({latitude:parseFloat(b.pois[d].location.split(",")[1]),longitude:parseFloat(b.pois[d].location.split(",")[0]),iconPath:e,width:22,height:32,id:d,name:b.pois[d].name,address:b.pois[d].address});f={markers:c,poisData:b.pois},a.success(f)}}else a.fail({errCode:b.data.infocode,errMsg:b.data.info})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})}var b=this,c=b.requestConfig;a.location?d(a.location):b.getWxLocation(a,function(a){d(a)})},AMapWX.prototype.getStaticmap=function(a){function f(b){c.push("location="+b),a.zoom&&c.push("zoom="+a.zoom),a.size&&c.push("size="+a.size),a.scale&&c.push("scale="+a.scale),a.markers&&c.push("markers="+a.markers),a.labels&&c.push("labels="+a.labels),a.paths&&c.push("paths="+a.paths),a.traffic&&c.push("traffic="+a.traffic);var e=d+c.join("&");a.success({url:e})}var e,b=this,c=[],d="https://restapi.amap.com/v3/staticmap?";c.push("key="+b.key),e=b.requestConfig,c.push("s="+e.s),c.push("platform="+e.platform),c.push("appname="+e.appname),c.push("sdkversion="+e.sdkversion),c.push("logversion="+e.logversion),a.location?f(a.location):b.getWxLocation(a,function(a){f(a)})},AMapWX.prototype.getInputtips=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.location&&(d["location"]=a.location),a.keywords&&(d["keywords"]=a.keywords),a.type&&(d["type"]=a.type),a.city&&(d["city"]=a.city),a.citylimit&&(d["citylimit"]=a.citylimit),wx.request({url:"https://restapi.amap.com/v3/assistant/inputtips",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.tips&&a.success({tips:b.data.tips})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getDrivingRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),a.strategy&&(d["strategy"]=a.strategy),a.waypoints&&(d["waypoints"]=a.waypoints),a.avoidpolygons&&(d["avoidpolygons"]=a.avoidpolygons),a.avoidroad&&(d["avoidroad"]=a.avoidroad),wx.request({url:"https://restapi.amap.com/v3/direction/driving",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.route&&a.success({paths:b.data.route.paths,taxi_cost:b.data.route.taxi_cost||""})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getWalkingRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),wx.request({url:"https://restapi.amap.com/v3/direction/walking",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.route&&a.success({paths:b.data.route.paths})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getTransitRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),a.strategy&&(d["strategy"]=a.strategy),a.city&&(d["city"]=a.city),a.cityd&&(d["cityd"]=a.cityd),wx.request({url:"https://restapi.amap.com/v3/direction/transit/integrated",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){if(b&&b.data&&b.data.route){var c=b.data.route;a.success({distance:c.distance||"",taxi_cost:c.taxi_cost||"",transits:c.transits})}},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},AMapWX.prototype.getRidingRoute=function(a){var b=this,c=b.requestConfig,d={key:b.key,s:c.s,platform:c.platform,appname:b.key,sdkversion:c.sdkversion,logversion:c.logversion};a.origin&&(d["origin"]=a.origin),a.destination&&(d["destination"]=a.destination),wx.request({url:"https://restapi.amap.com/v4/direction/bicycling",data:d,method:"GET",header:{"content-type":"application/json"},success:function(b){b&&b.data&&b.data.data&&a.success({paths:b.data.data.paths})},fail:function(b){a.fail({errCode:"0",errMsg:b.errMsg||""})}})},module.exports.AMapWX=AMapWX;
\ No newline at end of file
diff --git a/common/http.api.js b/common/http.api.js
index 4f70481..b9721d7 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -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,
diff --git a/manifest.json b/manifest.json
index d3e5ae0..8f2f333 100644
--- a/manifest.json
+++ b/manifest.json
@@ -61,7 +61,6 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        /* 小程序特有相关 */
         "appid" : "wxe27470b2f09a2508",
         "setting" : {
             "urlCheck" : false
diff --git a/pages.json b/pages.json
index 1931ff6..a5d12fa 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,7 @@
 				"onReachBottomDistance":50,
 				"app-plus": {
 					"titleNView": false ,//禁用原生导航栏
-					"softinputNavBar":"none",
+					// "softinputNavBar":"none",
 					"subNVues":[{  
 						"id": "homeTitleNvue", // 唯一标识  
 						"path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径  
diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index eef576f..46eb5a1 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -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() {
-				this.good._num++;
+				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() {
-				//丢弃
+				
 			}
 		}
 	};
diff --git a/pages/tabBar/cart/cart.vue b/pages/tabBar/cart/cart.vue
index 5dbd116..4455012 100644
--- a/pages/tabBar/cart/cart.vue
+++ b/pages/tabBar/cart/cart.vue
@@ -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){
-				this.goodsList[index]._num++;
-				this.sum();
+				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++){
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 920849e..374466d 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -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 {
diff --git a/pages/user/order_list/orderDetail.vue b/pages/user/order_list/orderDetail.vue
index 4568c44..d5f1234 100644
--- a/pages/user/order_list/orderDetail.vue
+++ b/pages/user/order_list/orderDetail.vue
@@ -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
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 6d49b93..e48f132 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -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)
 			}
 		}
 	}