aa

package.json

-{
+  {
   "name": "mpshaodai",
   "version": "0.0.2",
   "description": "A WePY project",

project.config.json

 {
   "description": "A WePY project",
   "setting": {
-    "urlCheck": false,
+    "urlCheck": true,
     "es6": true,
     "postcss": false,
     "minified": false,

src/app.wpy

@@ -55,6 +55,8 @@ wepy.app({
     wx.getSystemInfo({
       success: res => {
         //导航高度
+        this.$options.config.screenHeight = res.windowHeight
+        this.$options.config.screenWidth = res.windowWidth
         this.$options.config.title_height = res.statusBarHeight + 46;
         this.$options.config.statusbarHeight = res.statusBarHeight;
 
@@ -77,6 +79,8 @@ wepy.app({
     }
   },
   config:{
+    screenHeight: 0,
+    screenWidth: 0,
     title_height: "64",
     statusbarHeight: "24",
     titleIcon_height: "32",
@@ -84,17 +88,17 @@ wepy.app({
     title_top: "24",
     title_text: "xxx", // iphone X + 24
     prefix: 24,
-    // urlPrefix: 'https://sd.tmallab.com/spring/api'
-    urlPrefix: "http://127.0.0.1:8888/api"
+    urlPrefix: 'https://api.favormylikes.com/spring/api'
+    // urlPrefix: "http://127.0.0.1:8888/api"
   }
 });
 </script>
 <config>
 {
     pages: [
+      'pages/index',
 'pages/progress',
 
-      'pages/index',
     ],
 <!--"plugins": {-->
 <!--"ocr-plugin": {-->

src/pages/progress.wpy

@@ -118,10 +118,11 @@
         align-items: center;
         width: 100%;
         position: absolute;
-        margin-top: -44rpx;height: 52rpx;
+        margin-top: -46rpx;height: 52rpx;
       }
       .p1{
-        border-radius: 26rpx;
+        border: 8rpx solid white;
+        border-radius: 50%;
         display: flex;
         flex-direction: row;
         align-items: center;
@@ -129,8 +130,18 @@
         position: absolute;
         background: #BABABA;width: 52rpx;height: 52rpx;
       }
+      //.p1{
+      //  border-radius: 26rpx;
+      //  display: flex;
+      //  flex-direction: row;
+      //  align-items: center;
+      //  justify-content: center;
+      //  position: absolute;
+      //  background: #BABABA;width: 52rpx;height: 52rpx;
+      //}
       .pp1{
-        border-radius: 26rpx;
+        border: 8rpx solid white;
+        border-radius: 50%;
         display: flex;
         flex-direction: row;
         align-items: center;
@@ -139,6 +150,16 @@
         background: #45C9C2;
         width: 52rpx;height: 52rpx;
       }
+      //.pp1{
+      //  border-radius: 26rpx;
+      //  display: flex;
+      //  flex-direction: row;
+      //  align-items: center;
+      //  justify-content: center;
+      //  position: absolute;
+      //  background: #45C9C2;
+      //  width: 52rpx;height: 52rpx;
+      //}
       label{
         color: white;
         font-size: 24rpx;
@@ -209,14 +230,14 @@ module.exports.getTime = getTime;
         <image style="width: 33rpx;height: 33rpx" src="@/assets/kd.png"/>
         <span style="margin-left: 9rpx;font-size: 33rpx;color: #45C9C3">快递</span>
       </div>
-      <div class="tab">
+      <div class="tab" @tap="mallClick">
         <image style="width: 33rpx;height: 33rpx" src="@/assets/cs.png"/>
         <span style="margin-left: 9rpx;font-size: 33rpx;color: #272727">超市</span>
       </div>
     </div>
     <div class="main">
       <van-empty v-if="list.length===0" description="您还没有发布过捎带订单哦">
-        <van-button custom-class="bottom-button">
+        <van-button @tap="toIndex" custom-class="bottom-button">
           发布捎带
         </van-button>
       </van-empty>
@@ -288,9 +309,10 @@ module.exports.getTime = getTime;
           <span style="margin-left: 30rpx">取件点</span>
 
 
-          <div @tap="photo1(currentItem)" class="{{[currentItem.status>=1?'pp1':'p1']}}" style="margin-left: 116rpx">
-            <van-icon color="white" name="photograph" />
-          </div>
+<!--          <div @tap="photo1(currentItem)" class="{{[currentItem.status>=1?'pp1':'p1']}}" style=";margin-left: 116rpx;">-->
+<!--            <image style="position: absolute" src="@/assets/ty.png"/>-->
+<!--            <van-icon color="white" name="photograph" />-->
+<!--          </div>-->
 
           <span style="margin-left:78rpx" >快到楼下</span>
           <div @tap="photo2(currentItem)" class="{{[currentItem.status>=2?'pp1':'p1']}}" style="margin-left: 296rpx">
@@ -397,6 +419,12 @@ const app = getApp().$wepy.$options
 
 
 wepy.page({
+  onShareAppMessage: function (res) {
+    return {
+      title: '十秒下单，快速到寝',
+      path: '/pages/index'
+    }
+  },
     data:{
       active: 1,
       list: [],
@@ -405,10 +433,30 @@ wepy.page({
 
     },
     methods: {
+      toIndex(){
+        wx.switchTab({
+          url: "/pages/index"
+        });
+      },
+      mallClick(){
+        wx.showToast({
+          title: '尚未开放，尽请期待。',
+          icon: 'none',
+          duration: 3000,
+          mask: true
+        });
+      },
       sub(item) {
         wx.requestSubscribeMessage({
-          tmplIds: ['8VhR4ruZ-b6kZRzSzQ4TwI-Y8Rh8vSR1kg5R7kFDrfQ','8VhR4ruZ-b6kZRzSzQ4TwP1fPXITxSawzR-z_XsgMok','8VhR4ruZ-b6kZRzSzQ4TwOHT914KwUCpusAX0y6w2Wo'],
-          success (res) { }
+          tmplIds: ['CGlLzkCZy2Q5XaMvRw1-9gfHy_CRhk4_6LuXhKK2vI4','Lr1MlntU2DKsuxtrlTJT_d3uxOeIvKjIsjzHSKUpUOI','8VhR4ruZ-b6kZRzSzQ4TwIoQKtz7ODjkkHCgAsalFSE'],
+          success (res) {
+            wx.showToast({
+              title: '订阅成功',
+              icon: 'none',
+              duration: 1000,
+              mask: true
+            });
+          }
         })
       },
       closeDetailSheet(){
@@ -435,16 +483,16 @@ wepy.page({
       },
       photo2(item){
 
-        if(item.sendCredentials){
+        if(item.takeCredentials){
           wx.previewImage({
-            current: app.config.urlPrefix+'/download/'+item.sendCredentials, // 当前显示图片的http链接
-            urls: [app.config.urlPrefix+'/download/'+item.sendCredentials]
+            current: app.config.urlPrefix+'/download/'+item.takeCredentials, // 当前显示图片的http链接
+            urls: [app.config.urlPrefix+'/download/'+item.takeCredentials]
           })
         }else{
           wx.showToast({
-            title: '尚未送达宿舍楼',
+            title: '未上传图片',
             icon: 'none',
-            duration: 4000
+            duration: 3000
           })
         }
       },