linwenxin 8 ماه پیش
والد
کامیت
8daf79b7d0
4فایلهای تغییر یافته به همراه187 افزوده شده و 159 حذف شده
  1. 1 1
      src/App.vue
  2. 150 150
      src/manifest.json
  3. 35 3
      src/packageAttachment/pages/applicationParts/index.vue
  4. 1 5
      src/packageAttachment/pages/orderOfSales/card.vue

+ 1 - 1
src/App.vue

@@ -89,7 +89,7 @@ export default {
       redirection()
       const userInfo = await getUserInfo()
       console.log(userInfo)
-      if (!userInfo.avatar || !userInfo.nickName) {
+      if (!userInfo?.avatar || !userInfo?.nickName) {
         let randomNum = new Date().getTime().toString().substr(-6)
         let configInfo = await getConfigInfo()
         api

+ 150 - 150
src/manifest.json

@@ -1,161 +1,161 @@
 {
-    "name" : " ",
-    "appid" : "__UNI__ED0779D",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    "networkTimeout" : {
-        "request" : 30000,
-        "connectSocket" : 10000,
-        "uploadFile" : 100000,
-        "downloadFile" : 10000
-    },
-    "h5" : {
-        "title" : "",
-        "publicPath": "/",
-        "devServer" : {
-            "https" : false,
-            "port" : 3000,
-            "open" : true,
-            "proxy" : {
-                "/api" : {
-                    "target" : "http://127.0.0.1:3001",
-                    "changeOrigin" : true,
-                    "secure" : false,
-                    "pathRewrite" : {
-                        "^/api" : ""
-                    }
-                }
-            }
-        },
-        "router" : {
-            "mode" : "history",
-            "base": "/",
-            "cache": {
-                "mode": "path",
-                "pages": []
-            }
-        },
-        "optimization" : {
-            "prefetch" : true,
-            "preload" : true,
-            "treeShaking" : {
-                "enable" : true
-            }
-        },
-        "sdkConfigs" : {
-            // 使用地图或位置相关功能必须填写其一
-            "maps" : {
-                "qqmap" : {
-                    // 腾讯地图秘钥 https://lbs.qq.com/dev/console/key/manage
-                    "key" : ""
-                },
-                "google" : {
-                    // 谷歌地图秘钥(HBuilderX 3.2.10+)https://developers.google.com/maps/documentation/javascript/get-api-key
-                    "key" : ""
-                },
-                "amap" : {
-                    // 高德地图秘钥(HBuilderX 3.6.0+)https://console.amap.com/dev/key/app
-                    "key" : "df9bfabcba60cc6e7ad45ae9923a682d",
-                    // 高德地图安全密钥(HBuilderX 3.6.0+)https://console.amap.com/dev/key/app
-                    "securityJsCode" : "",
-                    // 高德地图安全密钥代理服务器地址(HBuilderX 3.6.0+)https://lbs.amap.com/api/jsapi-v2/guide/abc/prepare
-                    "serviceHost" : "https://jiasm.zfire.top/_AMapService"
-                }
-            }
+  "name": " ",
+  "appid": "__UNI__ED0779D",
+  "description": "",
+  "versionName": "1.0.0",
+  "versionCode": "100",
+  "transformPx": false,
+  "networkTimeout": {
+    "request": 30000,
+    "connectSocket": 10000,
+    "uploadFile": 100000,
+    "downloadFile": 10000
+  },
+  "h5": {
+    "title": "",
+    "publicPath": "/",
+    "devServer": {
+      "https": false,
+      "port": 3000,
+      "open": true,
+      "proxy": {
+        "/api": {
+          "target": "http://127.0.0.1:3001",
+          "changeOrigin": true,
+          "secure": false,
+          "pathRewrite": {
+            "^/api": ""
+          }
         }
+      }
     },
-    // 使用地图或位置相关功能必须填写其一
-    "mp-weixin" : {
-        /* 小程序特有相关 */
-        "requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ],
-        "appid" : "wx911583ecddef2439",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : true,
-            "postcss" : true,
-            "minified" : true,
-            "preloadBackgroundData" : false,
-            "newFeature" : true,
-            "coverView" : true,
-            "autoAudits" : false,
-            "showShadowRootInWxmlPanel" : true,
-            "scopeDataCheck" : false,
-            "uglifyFileName" : true,
-            "checkInvalidKey" : true,
-            "checkSiteMap" : true,
-            "uploadWithSourceMap" : true,
-            "bigPackageSizeSupport" : false /* 预览及真机调试时包体积上限是否调整为4M*/
-        },
-        "usingComponents" : true,
-        "optimization" : {
-            "subPackages" : true
-        },
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
-            }
-        }
+    "router": {
+      "mode": "history",
+      "base": "/",
+      "cache": {
+        "mode": "path",
+        "pages": []
+      }
+    },
+    "optimization": {
+      "prefetch": true,
+      "preload": true,
+      "treeShaking": {
+        "enable": true
+      }
     },
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents": false,
-        "splashscreen" : {
-            "alwaysShowBeforeRender": false,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
+    "sdkConfigs": {
+      // 使用地图或位置相关功能必须填写其一
+      "maps": {
+        "qqmap": {
+          // 腾讯地图秘钥 https://lbs.qq.com/dev/console/key/manage
+          "key": ""
+        },
+        "google": {
+          // 谷歌地图秘钥(HBuilderX 3.2.10+)https://developers.google.com/maps/documentation/javascript/get-api-key
+          "key": ""
         },
-        "modules" : {},
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {}
+        "amap": {
+          // 高德地图秘钥(HBuilderX 3.6.0+)https://console.amap.com/dev/key/app
+          "key": "df9bfabcba60cc6e7ad45ae9923a682d",
+          // 高德地图安全密钥(HBuilderX 3.6.0+)https://console.amap.com/dev/key/app
+          "securityJsCode": "",
+          // 高德地图安全密钥代理服务器地址(HBuilderX 3.6.0+)https://lbs.amap.com/api/jsapi-v2/guide/abc/prepare
+          "serviceHost": "https://jiasm.zfire.top/_AMapService"
         }
+      }
+    }
+  },
+  // 使用地图或位置相关功能必须填写其一
+  "mp-weixin": {
+    /* 小程序特有相关 */
+    "requiredPrivateInfos": ["chooseLocation", "getLocation", "chooseAddress"],
+    "appid": "wx911583ecddef2439",
+    "setting": {
+      "urlCheck": false,
+      "es6": true,
+      "postcss": true,
+      "minified": true,
+      "preloadBackgroundData": false,
+      "newFeature": true,
+      "coverView": true,
+      "autoAudits": false,
+      "showShadowRootInWxmlPanel": true,
+      "scopeDataCheck": false,
+      "uglifyFileName": true,
+      "checkInvalidKey": true,
+      "checkSiteMap": true,
+      "uploadWithSourceMap": true,
+      "bigPackageSizeSupport": false /* 预览及真机调试时包体积上限是否调整为4M*/
     },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents": false
+    "usingComponents": true,
+    "optimization": {
+      "subPackages": true
     },
-    "mp-toutiao" : {
-        "usingComponents" : true
+    "permission": {
+      "scope.userLocation": {
+        "desc": "你的位置信息将用于小程序位置接口的效果展示"
+      }
+    }
+  },
+  "app-plus": {
+    /* 5+App特有相关 */
+    "usingComponents": false,
+    "splashscreen": {
+      "alwaysShowBeforeRender": false,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
     },
-    "mp-qq" : {
-        "usingComponents" : true
+    "modules": {},
+    /* 模块配置 */
+    "distribute": {
+      /* 应用发布信息 */
+      "android": {
+        /* android打包配置 */
+        "permissions": [
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ]
+      },
+      "ios": {},
+      /* ios打包配置 */
+      "sdkConfigs": {}
     }
+  },
+  /* SDK配置 */
+  "quickapp": {},
+  /* 快应用特有相关 */
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": false
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "mp-qq": {
+    "usingComponents": true
+  }
 }

+ 35 - 3
src/packageAttachment/pages/applicationParts/index.vue

@@ -22,7 +22,36 @@
     </view>
     <!-- 列表 -->
     <view class="bottom-con">
-      <list @loadmore="loadMore" loadmoreoffset="20" show-scrollbar>
+      <zj-page-fill
+        @scrolltolower="loadMore"
+        :scrollAttribute="{
+          'refresher-enabled': false
+        }"
+      >
+        <view class="list_view_lay">
+          <view class="box" v-for="item in websitList" :key="item.websitId">
+            <view class="mb20 flex_abs mt20">
+              <text class="fw600 f32_302">{{ item.websitName }}</text>
+              <text class="f24_999">距离{{ item.distance }}km</text>
+            </view>
+            <view class="flex_abs">
+              <text class="f28_666" style="width: 520rpx">地址:{{ item.address }}</text>
+              <tag
+                style="
+                  width: 150rpx;
+                  height: 50rpx;
+                  background-image: linear-gradient(to bottom right, #7fdaff, #6da7ff);
+                  border-radius: 30rpx;
+                "
+              >
+                <text @tap.stop="toApplicationPartsForm(item)" class="f24_FFF">申请</text>
+              </tag>
+            </view>
+          </view>
+        </view>
+      </zj-page-fill>
+
+      <!-- <list @loadmore="loadMore" loadmoreoffset="20" show-scrollbar>
         <cell class="item" v-for="item in websitList" :key="item.websitId">
           <view class="mb20 flex_abs mt20">
             <text class="fw600 f32_302">{{ item.websitName }}</text>
@@ -42,7 +71,7 @@
             </tag>
           </view>
         </cell>
-      </list>
+      </list> -->
     </view>
   </view>
 </template>
@@ -51,9 +80,11 @@
 const sysInfo = uni.getSystemInfoSync()
 import api from '@/common/http/'
 import tag from '@/components/tag.vue'
+import zjPageFill from '@/components/zj-page-container/zj-page-fill.vue'
 export default {
   components: {
-    tag
+    tag,
+    zjPageFill
   },
   data() {
     return {
@@ -150,6 +181,7 @@ export default {
           }
         })
       })
+      console.log(addressInfo)
       let { lat, lng } = addressInfo
       this.latitude = lat
       this.longitude = lng

+ 1 - 5
src/packageAttachment/pages/orderOfSales/card.vue

@@ -23,11 +23,7 @@
       <view class="accessories_nfo_title"> 总金额: </view>
       <view class="accessories_nfo_info">
         <view>
-          {{
-            [...(item.itemList || []).map(a => Math.round(a.salesPrice * a.qty * 100) / 100), 0].reduce((a, b) => {
-              return a + b
-            })
-          }}
+          {{ item.totalAmount }}
         </view>
       </view>
     </view>