8.29 问题修改

api/request.js

@@ -1,72 +0,0 @@
-
-const api_url = 'https://sqtg.hdlkeji.com' //社区团购
-var requestHandler = {
-  url: "",
-  params: {},
-  success: function(res) {
-
-  },
-  fail: function() {
-
-  }
-}
-//GET
-function GET(requestHandler) {
-  request('GET', requestHandler)
-}
-//POST
-function POST(requestHandler) {
-  request_post('POST', requestHandler)
-}
-function request(method, requestHandler) {
-  var params = requestHandler.params;
-  var url = requestHandler.url;
-  wx.request({
-    url: api_url + url,
-    data: params,
-    method: method,
-    header: {
-      'Content-Type': 'application/json' // 默认值
-    },
-    success: function(res) {
-      requestHandler.success(res)
-    },
-    fail: function() {
-      requestHandler.fail();
-    }
-  })
-}
-
-function request_post(method, requestHandler) {
-  var params = requestHandler.params;
-  var url = requestHandler.url
-  var distanceType = requestHandler.distance;
-
-  wx.showLoading({
-    title: '加载中',
-    mask: true
-  })
-  wx.request({
-    url: api_url + url,
-    data: params,
-    method: method,
-    header: {
-      'content-type': 'application/x-www-form-urlencoded'
-    },
-    success: function (res) {
-      wx.hideLoading();
-      requestHandler.success(res)
-    },
-    fail: function() {
-      requestHandler.fail();
-    }
-  })
-
-}
-
-
-module.exports = {
-  GET: GET,
-  POST: POST,
-  drawTextVertical: drawTextVertical
-}

pages/addtogood/addtogood.js

@@ -422,6 +422,9 @@ Page({
   },
   // 输入售价
   inputPrice(e) {
+    this.setData({
+      price: e.detail.value
+    })
     if(this.data.specifications[0].title == '统一规格') {
       let specifications = this.data.specifications;
       specifications[0].price = e.detail.value;
@@ -432,10 +435,7 @@ Page({
         specificationText: this.data.specifications[0].title + '/' + this.data.specifications[0].price + '加币',
       })
     }
-    console.log(e.detail.value)
-    this.setData({
-      price: e.detail.value
-    })
+    
   },
   // 输入库存
   inputStock(e) {
@@ -655,6 +655,7 @@ Page({
       })
       return
     }
+    console.log(that.data.price)
     // 售价必录校验
     if (that.data.price == '') {
       wx.showToast({
@@ -854,6 +855,7 @@ Page({
       })
       return
     }
+    console.log(that.data.price)
     // 售价必录校验
     if (that.data.price == '') {
       wx.showToast({

pages/addtogood/addtogood.wxml

@@ -52,6 +52,7 @@
     </view>
     <view class="card-row">
       <view class="left">
+        <!-- <text style="color: red;">*</text> -->
         <text>规格</text>
       </view>
       <view class="right" bindtap="showSpecificationPopup">

pages/addtogood/addtogood.wxss

@@ -50,7 +50,7 @@ page {
 .jieshao-area {
   width: 93%;
   height: 170rpx;
-  padding-top: 26rpx;
+  padding-top: 28rpx;
 }
 
 .leng {

pages/announce/announce.wxss

@@ -72,7 +72,7 @@ page {
 .jieshao-name input {
   height: 92rpx;
   width: 92%;
-  color: #656565;
+  /* color: #656565; */
   font-size: 28rpx;
   border-radius: 20rpx;
 }
@@ -102,6 +102,7 @@ page {
 .jieshao-area {
   width: 93%;
   height: 170rpx;
+  font-size: 28rpx;
   padding-top: 26rpx;
 }
 

pages/confirmorder/confirmorder.js

@@ -238,55 +238,60 @@ Page({
   },
   // 修改地址
   submitEdit() {
-    let that = this;
-
-    if (that.data.editFormPhone == '') {
-      wx.showToast({
-        title: '手机号未录入',
-        icon: 'none', 
-        mask: true
-      })
-      return
-    }
-    wx.request({
-      url: api.Gang_point_edit,
-      header: {
-        'Authorization': wx.getStorageSync('token')
-      },
-      method: 'POST',
-      data: {
-        id: that.data.ziquAddress[that.data.ziquIndex].id,
-        name: that.data.ziquAddress[that.data.ziquIndex].name,
-        address: that.data.ziquAddress[that.data.ziquIndex].address,
-        remarks: that.data.ziquAddress[that.data.ziquIndex].remarks,
-        phone: that.data.editFormPhone
-      },
-      success(res) {
-        console.log(res);
-        wx.hideLoading()
-        if (res.data.code === 1) {
-          console.log('修改手机号成功')
-          that.openPayTypePicker()
-        } else {
-          wx.showToast({
-            title: res.data.msg,
-            mask: true,
-            icon: 'none'
-          })
-        }
-      },
-      fail(err) {
-        wx.hideLoading()
+    // 物流提交
+    if(this.data.tabType=='wuliu'){
+      this.openPayTypePicker()
+    }else{
+      let that = this;
+  
+      if (that.data.editFormPhone == '') {
         wx.showToast({
-          title: '发起网络请求失败',
-          icon: 'none',
+          title: '手机号未录入',
+          icon: 'none', 
           mask: true
         })
-      },
-      complete() {
-        // wx.hideLoading()
+        return
       }
-    })
+      wx.request({
+        url: api.Gang_point_edit,
+        header: {
+          'Authorization': wx.getStorageSync('token')
+        },
+        method: 'POST',
+        data: {
+          id: that.data.ziquAddress[that.data.ziquIndex].id,
+          name: that.data.ziquAddress[that.data.ziquIndex].name,
+          address: that.data.ziquAddress[that.data.ziquIndex].address,
+          remarks: that.data.ziquAddress[that.data.ziquIndex].remarks,
+          phone: that.data.editFormPhone
+        },
+        success(res) {
+          console.log(res);
+          wx.hideLoading()
+          if (res.data.code === 1) {
+            console.log('修改手机号成功')
+            that.openPayTypePicker()
+          } else {
+            wx.showToast({
+              title: res.data.msg,
+              mask: true,
+              icon: 'none'
+            })
+          }
+        },
+        fail(err) {
+          wx.hideLoading()
+          wx.showToast({
+            title: '发起网络请求失败',
+            icon: 'none',
+            mask: true
+          })
+        },
+        complete() {
+          // wx.hideLoading()
+        }
+      })
+    }
   },
   // 下单
   openPayTypePicker() {

pages/pintuandetail/pintuandetail.wxml

@@ -20,7 +20,8 @@
     <view class="body-center">
       <view bindtap="gobianji">
         <p>{{user_info.name}}</p>
-        <van-switch class="buttonClass" active-color="#FF874E" checked="{{ !isSubscription }}"  size="20px" bind:change="subscription" />
+          <van-switch wx:if="{{!isSubscription}}" class="buttonClass" active-color="#FF874E" checked="{{ false}}"  size="20px" bind:change="subscription" />
+          <van-switch wx:if="{{isSubscription}}" class="buttonClass" active-color="#FF874E" checked="{{ true }}"  size="20px" bind:change="noSubscription" />
         <button wx:if="{{!isSubscription}}" catchtap="subscription" style="background-color: #FF874E">
           <p>订阅</p>
         </button>

pages/publish/publish.js

@@ -8,7 +8,8 @@ Page({
    */
   data: {
     height: 0,
-    pintuan: []
+    pintuan: [],
+    creat:false, //是否能继续新建拼团
   },
 
   /**
@@ -50,9 +51,14 @@ Page({
         console.log(res);
         if (res.data.code === 1) {
           that.setData({
-            pintuan: res.data.data.gang_list
+            pintuan: res.data.data.gang_list,
+            creat:true
           })
         } else {
+          that.setData({
+            pintuan: res.data.data.gang_list,
+            creat:false
+          })
           wx.showToast({
             title: res.data.msg,
             mask: true,
@@ -121,4 +127,30 @@ Page({
       url: '/pages/pintuandetail/pintuandetail?type=dingyue&id=' + id,
     })
   },
+  announce(){
+    if(wx.getStorageSync('userinfo').id){
+      wx.navigateTo({
+        url: '/pages/announce/announce?type=add',
+      })
+      }else{
+        wx.showToast({
+            title: '请先登录',
+            mask: true,
+            icon: 'none'
+          })
+      }
+  },
+  copypastgroup(){
+    if(wx.getStorageSync('userinfo').id){
+      wx.navigateTo({
+        url: '/pages/copypastgroup/copypastgroup',
+      })
+      }else{
+        wx.showToast({
+            title: '请先登录',
+            mask: true,
+            icon: 'none'
+          })
+      }
+  },
 })

pages/publish/publish.wxml

@@ -5,8 +5,8 @@
 </view>
 <view style="height: {{height*2 + 20}}px;width: 10rpx;"></view>
 <view class="pub-top">
-  <button class="pub-but-one" bindtap="navgo" data-url="/pages/announce/announce?type=add">创建新拼团</button>
-  <button class="pub-but-two" bindtap="navgo" data-url="/pages/copypastgroup/copypastgroup">复制往期拼团</button>
+  <button class="pub-but-one" bindtap="navgo" catchtap="announce">创建新拼团</button>
+  <button class="pub-but-two" bindtap="navgo" catchtap="copypastgroup">复制往期拼团</button>
 </view>
 <view class="pub-line">
   <view class="pub-line-1"></view>