Merge branch 'master' of http://222.85.201.140:10002/xuyunhui/chain_jje_uniapp

myPages/setting/index.vue

@@ -126,10 +126,10 @@ export default {
 				}
 
 				.arrow-right{
-					width:32%;
+					width:70%;
 					text-align: right;
 					margin: 0 auto;
-					cursor: pointer;
+					//cursor: pointer;
 					padding-top: 3px;
 					padding-right: 6px;
 					display: flex;

myPages/setting/setting-account-password.vue

@@ -14,14 +14,16 @@
 							labelWidth="auto"
 							labelAlign="right"
 						  >
-						<u--input
-							v-model="userInfo.phonenumber"
-							placeholder="请输入手机号"
-							border="bottom"
-							type="number"
-							disabled="disabled"
-							maxlength="11"
-						></u--input>
+<!--						<u&#45;&#45;input-->
+<!--							v-model=""-->
+<!--							placeholder="请输入手机号"-->
+<!--							border="bottom"-->
+<!--							type="number"-->
+<!--							disabled-->
+<!--              class="input"-->
+<!--							maxlength="11"-->
+<!--						></u&#45;&#45;input>-->
+            <text style="color: #afafaf; transform: translateX(10rpx);font-size: 30rpx ">{{userInfo.phonenumber}}</text>
 					</u-form-item>
 					<u-form-item
 						labelWidth="auto"

myPages/setting/setting-telphone.vue

@@ -184,6 +184,7 @@ export default {
     },
     // 获取手机验证码
     getSmsCode() {
+      console.log('cacacacacacaca',this.userInfo)
       let that = this;
       if (!this.userInfo.phonenumber) {
         uni.$u.toast('请认真填写手机号');

orderPages/bookService/index.vue

@@ -1,520 +1,524 @@
 <template>
-    <view class="page">
-        <view class="flex-col group">
-            <view class="flex-col justify-around groupItem">
-                <view class="groupItemKey">
-                    <text>服务对象</text>
-                </view>
-                <view class="flex-row justify-between groupItemContent" @click="getServiceObject">
-                    <text>{{serviceObject.nickName || '请选择对象' }}</text>
-                    <u-icon name="arrow-right" color="#666" size="18"></u-icon>
-                </view>
-            </view>
+  <view class="page">
+    <view class="flex-col group">
+      <view class="flex-col justify-around groupItem">
+        <view class="groupItemKey">
+          <text>服务对象</text>
+        </view>
+        <view class="flex-row justify-between groupItemContent" @click="getServiceObject">
+          <text>{{ serviceObject.nickName || '请选择对象' }}</text>
+          <u-icon name="arrow-right" color="#666" size="18"></u-icon>
+        </view>
+      </view>
 
-            <view class="flex-col justify-around groupItem">
-                <view class="groupItemKey">
-                    <text>服务类别</text>
-                </view>
-                <picker  @change="bindPickerChange" mode='selector'  range-key="typeName" :value="storeServiceIndex" :range="storeServiceList">
-                    <view class="flex-row justify-between groupItemContent">
-                        <text>{{storeServiceList[storeServiceIndex].typeName || '请选择服务类别' }}</text>
-                        <u-icon name="arrow-right" color="#666" size="18"></u-icon>
-                    </view>
-                </picker>
-            </view>
+      <view class="flex-col justify-around groupItem">
+        <view class="groupItemKey">
+          <text>服务类别</text>
         </view>
+        <picker @change="bindPickerChange" mode='selector' range-key="typeName" :value="storeServiceIndex"
+                :range="storeServiceList">
+          <view class="flex-row justify-between groupItemContent">
+            <text>{{ storeServiceList[storeServiceIndex].typeName || '请选择服务类别' }}</text>
+            <u-icon name="arrow-right" color="#666" size="18"></u-icon>
+          </view>
+        </picker>
+      </view>
+    </view>
 
 
-        <view class="flex-col group marginTop">
+    <view class="flex-col group marginTop">
 
-            <view class="flex-row ">
-                <view class="hint">
-                    <text>!</text>
-                </view>
-                <view class="hintCentent">
-                    <text>需提前一天起预约，取消订单服务需服务前一天取消</text>
-                </view>
-            </view>
+      <view class="flex-row ">
+        <view class="hint">
+          <text>!</text>
+        </view>
+        <view class="hintCentent">
+          <text>需提前一天起预约，取消订单服务需服务前一天取消</text>
+        </view>
+      </view>
 
-            <view class="flex-col justify-around groupItem">
-                <view class="groupItemKey">
-                    <text>服务日期</text>
-                </view>
-                <picker  @change="bindPickerChange1" mode='selector'  range-key="label" :value="periodDateIndex" :range="periodDateList">
-                    <view class="flex-row justify-between groupItemContent">
-                        <text>{{periodDateList[periodDateIndex].label || '请选择服务日期' }}</text>
-                        <u-icon name="arrow-right" color="#666" size="18"></u-icon>
-                    </view>
-                </picker>
-            </view>
+      <view class="flex-col justify-around groupItem">
+        <view class="groupItemKey">
+          <text>服务日期</text>
+        </view>
+        <picker @change="bindPickerChange1" mode='selector' range-key="label" :value="periodDateIndex"
+                :range="periodDateList">
+          <view class="flex-row justify-between groupItemContent">
+            <text>{{ periodDateList[periodDateIndex].label || '请选择服务日期' }}</text>
+            <u-icon name="arrow-right" color="#666" size="18"></u-icon>
+          </view>
+        </picker>
+      </view>
+
+      <view class="flex-col justify-around groupItem">
+
+        <view class="groupItemKey">
+          <text>服务时段</text>
+        </view>
+        <picker @change="bindPickerChange2" mode='selector' range-key="label" :value="periodTimeIndex"
+                :range="periodTimeList">
+          <view class="flex-row justify-between groupItemContent">
+            <text>{{ periodTimeList[periodTimeIndex].label || '服务时段' }}</text>
+            <u-icon name="arrow-right" color="#666" size="18"></u-icon>
+          </view>
+        </picker>
+      </view>
+
+      <view class="flex-col justify-around groupItem">
+        <view class="groupItemKey">
+          <text>服务人员</text>
+        </view>
+        <view class="flex-row justify-between groupItemContent" @click="chooseServiceTeacher">
+          <text>{{ serviceTeacher.personName || '请选择服务人员' }}</text>
+          <u-icon name="arrow-right" color="#666" size="18"></u-icon>
+        </view>
+      </view>
 
-            <view class="flex-col justify-around groupItem">
-
-                <view class="groupItemKey">
-                    <text>服务时段</text>
-                </view>
-                <picker  @change="bindPickerChange2" mode='selector'  range-key="label" :value="periodTimeIndex" :range="periodTimeList">
-                    <view class="flex-row justify-between groupItemContent">
-                        <text>{{periodTimeList[periodTimeIndex].label || '服务时段' }}</text>
-                        <u-icon name="arrow-right" color="#666" size="18"></u-icon>
-                    </view>
-                </picker>
-            </view>
 
-            <view class="flex-col justify-around groupItem">
-                <view class="groupItemKey">
-                    <text>服务人员</text>
-                </view>
-                <view class="flex-row justify-between groupItemContent" @click="chooseServiceTeacher">
-                    <text>{{serviceTeacher.personName || '请选择服务人员' }}</text>
-                    <u-icon name="arrow-right" color="#666" size="18"></u-icon>
-                </view>
-            </view>
+    </view>
+    <view class="flex-col group marginTop">
+      <view class="groupItemKey">
+        <text>服务定制</text>
+      </view>
+      <view class="textareaView">
+        <textarea v-model="remark" placeholder-style="color:#999999;fontSize:28rpx" placeholder="如有其它特殊需求，请在此输入您的需求"/>
+      </view>
+    </view>
 
+    <view :style="{'height':'236rpx'}"></view>
 
+    <view class="flex-col  group2 ">
+      <view class="btnTitle">
+        <text>提交订单之前需支付预约服务费用</text>
+      </view>
+      <view class="btn flex-row justify-between">
+        <view>
+          <text class="title">待支付</text>
+          <text class="num">￥{{ price }}</text>
         </view>
-        <view class="flex-col group marginTop">
-            <view class="groupItemKey">
-                <text>服务定制</text>
-            </view>
-            <view class="textareaView">
-                <textarea v-model="remark" placeholder-style="color:#999999;fontSize:28rpx" placeholder="如有其它特殊需求，请在此输入您的需求"/>
-            </view>
+        <view class="btnRight" @click="commitOrder">
+          <text>提交</text>
+        </view>
+      </view>
+    </view>
+
+    <uni-popup ref="passwordPopup">
+      <view class="passwordView flex-col">
+        <view class="h-pay-title flex-row justify-center">
+          <text>请输入交易密码</text>
         </view>
+        <view class="h-tab-bar flex-row justify-center">
+          <u-code-input v-model="password" mode="box" dot></u-code-input>
+        </view>
+        <view class="flex-row justify-center">
+          <view class="h-operate-btn flex-row justify-center" @click="balancePay">
+            <text>确定</text>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
+
+    <uni-popup ref="popup" type="bottom">
 
-        <view :style="{'height':'236rpx'}"></view>
+      <view class=" payView">
+        <view class="flex-row justify-between">
+          <text class="payType">请选择支付方式</text>
+          <image class="x" src="/static/common/ox.png" @click="closePayPopup"></image>
+        </view>
+        <view class="payTitle">
+          <text>选择微信支付或余额支付</text>
+        </view>
+        <view class="payItem flex-row justify-between" @click="payItem(1)">
+          <view class="flex-row">
+            <u-icon name="/static/me/u701.png" color="#38db38" size="36"></u-icon>
+            <view class="payName flex-col justify-center">
+              <text>余额支付</text>
+              <text class="balance">可以余额￥{{ userInfo.balance || 0 }}</text>
+            </view>
+          </view>
 
-        <view class="flex-col  group2 ">
-            <view class="btnTitle">
-                <text>提交订单之前需支付预约服务费用</text>
+          <view class="flex-col justify-center">
+            <view v-if="curServiceTab === 1">
+              <u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
             </view>
-            <view class="btn flex-row justify-between">
-                <view>
-                    <text class="title">待支付</text>
-                    <text class="num">￥{{price}}</text>
-                </view>
-                <view class="btnRight" @click="commitOrder">
-                    <text>提交</text>
-                </view>
+            <view v-else>
+              <u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>
             </view>
+          </view>
+
         </view>
 
-        <uni-popup ref="passwordPopup">
-            <view class="passwordView flex-col">
-                <view class="h-pay-title flex-row justify-center">
-                    <text>请输入交易密码</text>
-                </view>
-                <view class="h-tab-bar flex-row justify-center">
-                    <u-code-input  v-model="password" mode="box" dot></u-code-input>
-                </view>
-                <view class="flex-row justify-center">
-                    <view class="h-operate-btn flex-row justify-center" @click="balancePay">
-                        <text>确定</text>
-                    </view>
-                </view>
+        <view class="payItem flex-row justify-between" @click="payItem(2)">
+          <view class="flex-row">
+            <u-icon name="weixin-circle-fill" color="#38db38" size="36"></u-icon>
+            <view class="payName flex-col justify-center">
+              <text>微信支付</text>
             </view>
-        </uni-popup>
-
-        <uni-popup ref="popup" type="bottom">
-
-            <view class=" payView">
-                <view class="flex-row justify-between">
-                    <text class="payType">请选择支付方式</text>
-                    <image class="x" src="/static/common/ox.png" @click="closePayPopup"></image>
-                </view>
-                <view class="payTitle">
-                    <text>选择微信支付或余额支付</text>
-                </view>
-
-
-                <view class="payItem flex-row justify-between" @click="payItem(1)">
-                    <view class="flex-row">
-                        <u-icon name="/static/me/u701.png" color="#38db38" size="36"></u-icon>
-                        <view class="payName flex-col justify-center">
-                            <text>余额支付</text>
-                            <text class="balance">可以余额￥{{userInfo.balance || 0}}</text>
-                        </view>
-                    </view>
-
-                    <view class="flex-col justify-center">
-                        <view v-if="curServiceTab === 1" >
-                            <u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
-                        </view>
-                        <view v-else>
-                            <u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>
-                        </view>
-                    </view>
-
-                </view>
-
-                <view class="payItem flex-row justify-between" @click="payItem(2)">
-                    <view class="flex-row">
-                        <u-icon name="weixin-circle-fill" color="#38db38" size="36"></u-icon>
-                        <view class="payName flex-col justify-center">
-                            <text>微信支付</text>
-                        </view>
-                    </view>
-                    <view class="flex-col justify-center">
-                        <view v-if="curServiceTab === 2" >
-                            <u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
-                        </view>
-                        <view v-else>
-                            <u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>
-                        </view>
-                    </view>
-                </view>
-
-                <view class="commitBtn" @click="commonGeneralOrder">
-                    <text>确定</text>
-                </view>
-
+          </view>
+          <view class="flex-col justify-center">
+            <view v-if="curServiceTab === 2">
+              <u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
+            </view>
+            <view v-else>
+              <u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>
             </view>
+          </view>
+        </view>
+
+        <view class="commitBtn" @click="commonGeneralOrder">
+          <text>确定</text>
+        </view>
 
-        </uni-popup>
+      </view>
 
-    </view>
+    </uni-popup>
+
+  </view>
 </template>
 
 <script>
 
 export default {
 
-    data() {
-        return {
-            password:'',
-            remark:'',
-            userInfo:{},
-            curServiceTab:1,
-            //服务门店
-            store:{},
-            //服务对象
-            serviceObject:{},
-            //服务技师
-            serviceTeacher:{},
-            //服务类型
-            storeServiceList:[],
-            storeServiceIndex:0,
-            //服务时间
-            periodDateList:[],
-            periodDateIndex:0,
-            //服务时段
-            periodTimeList:[],
-            periodTimeIndex:0,
-            //预约费用
-            price:'0',
-            //订单编号
-            orderNo:'',
-            subOrderNo:''
+  data() {
+    return {
+      password: '',
+      remark: '',
+      userInfo: {},
+      curServiceTab: 1,
+      //服务门店
+      store: {},
+      //服务对象
+      serviceObject: {},
+      //服务技师
+      serviceTeacher: {},
+      //服务类型
+      storeServiceList: [],
+      storeServiceIndex: 0,
+      //服务时间
+      periodDateList: [],
+      periodDateIndex: 0,
+      //服务时段
+      periodTimeList: [],
+      periodTimeIndex: 0,
+      //预约费用
+      price: '0',
+      //订单编号
+      orderNo: '',
+      subOrderNo: ''
 
-        }
-    },
-    onLoad() {
-        this.listServiceObject()
-        this.store = uni.getStorageSync('storeInfo')
-        this.userInfo = uni.getStorageSync('userInfo')
-        // this.storeAllServiceList()
-        this.category()
-        this.selectDate()
+    }
+  },
+  onLoad() {
+    this.listServiceObject()
+    this.store = uni.getStorageSync('storeInfo')
+    this.userInfo = uni.getStorageSync('userInfo')
+    // this.storeAllServiceList()
+    this.category()
+    this.selectDate()
+  },
+
+  onShow() {
+    // 服务对象
+    uni.$off()
+    uni.$on('selectedServiceObject', this.selectedServiceObject);
+    uni.$on('selectedServiceTeacher', this.selectedServiceTeacher);
+
+  },
+
+  methods: {
+
+    payItem(num) {
+      if (this.userInfo.balance < this.price) {
+        return
+      }
+      this.curServiceTab = num
     },
 
-    onShow(){
-        // 服务对象
-        uni.$off()
-        uni.$on('selectedServiceObject', this.selectedServiceObject);
-        uni.$on('selectedServiceTeacher', this.selectedServiceTeacher);
+    //提交订单
+    commitOrder() {
+
+      if (!this.serviceTeacher.personId) {
+        uni.$u.toast('请选择服务人员')
+        return
+      }
+      if (this.price > 0) {
+        this.$refs.popup.open()
+        if (this.userInfo.balance < this.price) {
+          this.curServiceTab = 2
+        }
+      } else {
+        this.commonGeneralOrder()
+      }
+
+    },
 
+    closePayPopup() {
+      this.$refs.popup.close()
     },
 
-    methods: {
-
-        payItem(num){
-            if (this.userInfo.balance < this.price){
-                return
-            }
-            this.curServiceTab = num
-        },
-
-        //提交订单
-        commitOrder(){
-
-            if (!this.serviceTeacher.personId){
-                uni.$u.toast('请选择服务人员')
-                return
-            }
-            if (this.price > 0){
-                this.$refs.popup.open()
-                if (this.userInfo.balance < this.price){
-                    this.curServiceTab=2
-                }
-            }else {
-                this.commonGeneralOrder()
-            }
-
-        },
-
-        closePayPopup(){
-            this.$refs.popup.close()
-        },
-
-        wechatPay(){
-            let that = this;
-            // 发起微信支付
-            this.$api.wechatPay({
-                orderNo:this.subOrderNo
-            }).then((res)=>{
-                var param = res.data.data;
-                uni.requestPayment({
-                    appId: param.appid,
-                    timeStamp: param.timestamp+"",
-                    nonceStr: param.noncestr,
-                    package: "prepay_id="+param.prepayid,
-                    signType: "RSA",
-                    paySign: param.sign,
-                    success: res => {
-                        uni.showToast({
-                            title: '支付成功!'
-                        });
-                        setTimeout(res=>{
-                            uni.switchTab({
-                                url:'/pages/order/index'
-                            })
-                        },1000)
-                    },
-                    fail: res => {
-                        console.log(res)
-                        uni.showModal({
-                            content: '支付失败',
-                            showCancel: false
-                        });
-
-                        setTimeout(res=>{
-                            uni.switchTab({
-                                url:'/pages/order/index'
-                            })
-                        },1000)
-
-                    }
-                });
-            }).catch(() =>{
-                uni.showToast({
-                    title: "操作失败"
-                })
+    wechatPay() {
+      let that = this;
+      // 发起微信支付
+      this.$api.wechatPay({
+        orderNo: this.subOrderNo
+      }).then((res) => {
+        var param = res.data.data;
+        uni.requestPayment({
+          appId: param.appid,
+          timeStamp: param.timestamp + "",
+          nonceStr: param.noncestr,
+          package: "prepay_id=" + param.prepayid,
+          signType: "RSA",
+          paySign: param.sign,
+          success: res => {
+            uni.showToast({
+              title: '支付成功!'
             });
-        },
-
-        //余额支付
-        balancePay(){
-
-            let that = this;
-            // if(this.password.length< 6 ){
-            //     uni.showToast({
-            //         title: "交易密码不能小于6位"
-            //     })
-            //     return ;
-            // }
-            // this.$refs.passwordPopup.close()
-
-            this.$api.balancePay({
-                orderNo: this.subOrderNo,
-                password: ''
-            }).then((res)=>{
-                that.$refs.popup.close()
-                uni.showToast({
-                    title: '支付成功!'
-                });
-
-                setTimeout(res=>{
-                    uni.switchTab({
-                        url:'/pages/order/index'
-                    })
-                },1000)
-
-
-                this.getUserInfo()
-            }).catch((res) =>{
-              console.log(res)
-                that.$refs.popup.close()
-              let msg = res.data.msg || '操作失败';
-                uni.showToast({
-                    title: msg,
-                  icon:'error'
-                })
-
-                // setTimeout(res=>{
-                //     uni.switchTab({
-                //         url:'/pages/order/index'
-                //     })
-                // },1000)
+            setTimeout(res => {
+              uni.switchTab({
+                url: '/pages/order/index'
+              })
+            }, 1000)
+          },
+          fail: res => {
+            console.log(res)
+            uni.showModal({
+              content: '支付失败',
+              showCancel: false
             });
 
-        },
-
-        getUserInfo(){
-            this.$api.getUserInfo().then(res=>{
-                console.log('++++++++++++获取用户信息++++++++++++++++++',res)
-                uni.setStorageSync('userInfo',res.data.data)
-                this.userInfo = res.data.data
-            })
-
-        },
-
-        commonGeneralOrder(){
-            this.$refs.popup.close()
-          this.$api.commonGeneralOrder({
-              orderType: 1,
-              serviceObjectId: this.serviceObject.id,
-              serviceAttribute: 2,
-              serviceStoreId: this.store.storeId,
-              serviceTypeId:this.storeServiceList[this.storeServiceIndex].id,
-              serviceDate:this.periodDateList[this.periodDateIndex].label,
-              serviceUserId:this.serviceTeacher.personId,
-              serviceStartTime:this.periodTimeList[this.periodTimeIndex].label,
-              timeRangeId:this.serviceTeacher.crewPeriodId,
-              remark:this.remark
-          }).then(res=>{
-              this.orderNo=res.data.data.orderNo
-              this.subOrderNo=res.data.data.subOrderNo
-              if (res.data.data.subOrderNo === null){
-                    uni.switchTab({
-                        url:'/pages/order/index'
-                    })
-              }else{
-                  if (this.curServiceTab === 1){
-                      //开启余额支付密码框
-                    // this.$refs.passwordPopup.open()
-
-                      this.balancePay()
-
-                  }
-                  if (this.curServiceTab === 2){
-                      //调微信支付
-                      this.wechatPay()
-                  }
-              }
+            setTimeout(res => {
+              uni.switchTab({
+                url: '/pages/order/index'
+              })
+            }, 1000)
 
+          }
+        });
+      }).catch(() => {
+        uni.showToast({
+          title: "操作失败"
+        })
+      });
+    },
+
+    //余额支付
+    balancePay() {
+
+      let that = this;
+      // if(this.password.length< 6 ){
+      //     uni.showToast({
+      //         title: "交易密码不能小于6位"
+      //     })
+      //     return ;
+      // }
+      // this.$refs.passwordPopup.close()
+
+      this.$api.balancePay({
+        orderNo: this.subOrderNo,
+        password: ''
+      }).then((res) => {
+        that.$refs.popup.close()
+        uni.showToast({
+          title: '支付成功!'
+        });
+
+        setTimeout(res => {
+          uni.switchTab({
+            url: '/pages/order/index'
           })
-        },
-
-
-
-
-        //获取预约费用
-        getAppointmentPrice(){
-            this.$api.getAppointmentPrice({
-                storeId: this.store.storeId,
-                date: this.periodDateList[this.periodDateIndex].label,
-                timeRangeId: this.serviceTeacher.crewPeriodId,
-                servicePersonId: this.serviceTeacher.personId,
-                serviceProjectId:this.storeServiceList[this.storeServiceIndex].id
-            }).then(res=>{
-                this.price= res.data.data.price
-            })
-        },
-
-        //选择服务人员
-        chooseServiceTeacher(){
-
-            if (this.periodDateList.length <=0 || this.periodTimeList.length<=0){
-                uni.$u.toast('请选择服务时间')
-            }
-          console.log("a->", this.periodTimeIndex)
-            console.log("b->", this.periodTimeList)
-            uni.navigateTo({
-                url: '/orderPages/serviceTeacher/index?organization='+this.store.storeId + '&schedulingDate=' +this.periodDateList[this.periodDateIndex].label + '&time='+this.periodTimeList[this.periodTimeIndex].value
-            })
-        },
-
-        //获取排班日期
-        selectDate(){
-            console.log(this.store)
-            this.$api.selectDate({
-                organization:this.store.storeId
-            }).then(res =>{
-                this.periodDateList = res.data.data
-                // this.selectPeriodByDate(res.data.data[0].label)
-                this.getServiceTime(res.data.data[0].label);
-            })
-        },
-
-        //获取门店排班时段
-        // selectPeriodByDate(date){
-        //     this.$api.selectPeriodByDate({
-        //         organization:this.store.storeId,
-        //         schedulingDate:date
-        //     }).then(res =>{
-        //         this.periodTimeList = res.data.data
-        //         if (this.periodTimeList.length===0){
-        //             uni.$u.toast('暂无排班时段')
-        //         }
+        }, 1000)
+
+
+        this.getUserInfo()
+      }).catch((res) => {
+        console.log(res)
+        that.$refs.popup.close()
+        let msg = res.data.msg || '操作失败';
+        uni.showToast({
+          title: msg,
+          icon: 'error'
+        })
+
+        // setTimeout(res=>{
+        //     uni.switchTab({
+        //         url:'/pages/order/index'
         //     })
-        // },
-
-      //获取门店排班时段
-      getServiceTime(date){
-        this.$api.getServiceTime({
-          storeId: this.store.storeId,
-          date: date
-        }).then(res =>{
-          this.periodTimeList = res.data.data
-          if (this.periodTimeList.length===0){
-            uni.$u.toast('暂无排班时段')
+        // },1000)
+      });
+
+    },
+
+    getUserInfo() {
+      this.$api.getUserInfo().then(res => {
+        console.log('++++++++++++获取用户信息++++++++++++++++++', res)
+        uni.setStorageSync('userInfo', res.data.data)
+        this.userInfo = res.data.data
+      })
+
+    },
+
+    commonGeneralOrder() {
+      this.$refs.popup.close()
+
+      this.$api.commonGeneralOrder({
+        orderType: 1,
+        serviceObjectId: this.serviceObject.id,
+        serviceAttribute: 2,
+        serviceStoreId: this.store.storeId,
+        serviceTypeId: this.storeServiceList[this.storeServiceIndex].id,
+        serviceDate: this.periodDateList[this.periodDateIndex].label,
+        serviceUserId: this.serviceTeacher.personId,
+        serviceStartTime: this.periodTimeList[this.periodTimeIndex].label,
+        timeRangeId: this.serviceTeacher.crewPeriodId,
+        remark: this.remark
+      }).then(res => {
+        this.orderNo = res.data.data.orderNo
+        this.subOrderNo = res.data.data.subOrderNo
+        uni.showLoading({
+          title:'加载中...'
+        });
+        if (res.data.data.subOrderNo === null) {
+          uni.switchTab({
+            url: '/pages/order/index'
+          })
+        } else {
+          if (this.curServiceTab === 1) {
+            //开启余额支付密码框
+            // this.$refs.passwordPopup.open()
+            this.balancePay()
+          }
+          if (this.curServiceTab === 2) {
+            //调微信支付
+            this.wechatPay()
           }
+        }
+
+      })
+      setTimeout(()=>{
+        uni.hideLoading()
+      },0)
+    },
+
+
+    //获取预约费用
+    getAppointmentPrice() {
+      this.$api.getAppointmentPrice({
+        storeId: this.store.storeId,
+        date: this.periodDateList[this.periodDateIndex].label,
+        timeRangeId: this.serviceTeacher.crewPeriodId,
+        servicePersonId: this.serviceTeacher.personId,
+        serviceProjectId: this.storeServiceList[this.storeServiceIndex].id
+      }).then(res => {
+        this.price = res.data.data.price
+      })
+    },
+
+    //选择服务人员
+    chooseServiceTeacher() {
+
+      if (this.periodDateList.length <= 0 || this.periodTimeList.length <= 0) {
+        uni.$u.toast('请选择服务时间')
+      }
+      console.log("a->", this.periodTimeIndex)
+      console.log("b->", this.periodTimeList)
+      uni.navigateTo({
+        url: '/orderPages/serviceTeacher/index?organization=' + this.store.storeId + '&schedulingDate=' + this.periodDateList[this.periodDateIndex].label + '&time=' + this.periodTimeList[this.periodTimeIndex].value
+      })
+    },
+
+    //获取排班日期
+    selectDate() {
+      console.log(this.store)
+      this.$api.selectDate({
+        organization: this.store.storeId
+      }).then(res => {
+        this.periodDateList = res.data.data
+        // this.selectPeriodByDate(res.data.data[0].label)
+        this.getServiceTime(res.data.data[0].label);
+      })
+    },
+
+    //获取门店排班时段
+    // selectPeriodByDate(date){
+    //     this.$api.selectPeriodByDate({
+    //         organization:this.store.storeId,
+    //         schedulingDate:date
+    //     }).then(res =>{
+    //         this.periodTimeList = res.data.data
+    //         if (this.periodTimeList.length===0){
+    //             uni.$u.toast('暂无排班时段')
+    //         }
+    //     })
+    // },
+
+    //获取门店排班时段
+    getServiceTime(date) {
+      this.$api.getServiceTime({
+        storeId: this.store.storeId,
+        date: date
+      }).then(res => {
+        this.periodTimeList = res.data.data
+        if (this.periodTimeList.length === 0) {
+          uni.$u.toast('暂无排班时段')
+        }
+      })
+    },
+
+    // 查询服务对像信息列表
+    listServiceObject() {
+      this.$api.listServiceObject({}).then((res) => {
+        this.serviceObject = res.data.data[0]
+      }).catch((err) => {
+        uni.showToast({
+          title: "操作失败"
         })
-      },
-
-        // 查询服务对像信息列表
-        listServiceObject(){
-            this.$api.listServiceObject({}).then((res)=>{
-                this.serviceObject = res.data.data[0]
-            }).catch((err) =>{
-                uni.showToast({
-                    title: "操作失败"
-                })
-            });
-        },
-
-        getServiceObject(){
-            uni.navigateTo({
-                url:'/orderPages/serviceObject/index'
-            })
-        },
-        selectedServiceObject(e){
-            this.serviceObject = e
-        },
-
-        selectedServiceTeacher(e){
-            this.serviceTeacher = e
-            this.getAppointmentPrice()
-        },
-
-        bindPickerChange(e){
-            this.storeServiceIndex= e.detail.value
-            console.log(e)
-        },
-        bindPickerChange1(e){
-            this.periodDateIndex= e.detail.value
-            this.getServiceTime(this.periodDateList[e.detail.value].label)
-          this.serviceTeacher = {};
-            console.log(e)
-        },
-        bindPickerChange2(e){
-            this.periodTimeIndex= e.detail.value
-          this.serviceTeacher = {}
-            console.log(e)
-        },
-
-        category(){
-            this.$api.category({storeId:this.store.storeId}).then(res=>{
-                this.storeServiceList= res.data.data
-            })
-
-        },
+      });
+    },
 
-    }
+    getServiceObject() {
+      uni.navigateTo({
+        url: '/orderPages/serviceObject/index'
+      })
+    },
+    selectedServiceObject(e) {
+      this.serviceObject = e
+    },
+
+    selectedServiceTeacher(e) {
+      this.serviceTeacher = e
+      this.getAppointmentPrice()
+    },
+
+    bindPickerChange(e) {
+      this.storeServiceIndex = e.detail.value
+      console.log(e)
+    },
+    bindPickerChange1(e) {
+      this.periodDateIndex = e.detail.value
+      this.getServiceTime(this.periodDateList[e.detail.value].label)
+      this.serviceTeacher = {};
+      console.log(e)
+    },
+    bindPickerChange2(e) {
+      this.periodTimeIndex = e.detail.value
+      this.serviceTeacher = {}
+      console.log(e)
+    },
+
+    category() {
+      this.$api.category({storeId: this.store.storeId}).then(res => {
+        this.storeServiceList = res.data.data
+      })
+
+    },
+
+  }
 }
 </script>
 
 <style scoped lang="scss">
-    @import '/common/css/common.css';
-    @import './index.rpx.scss';
+@import '/common/css/common.css';
+@import './index.rpx.scss';
 </style>

orderPages/orderDetail/index.vue

@@ -139,7 +139,7 @@
 
             <view class="bottomHeight"></view>
 
-            <view class="bottom1 flex-col" v-if="order.orderStatus == 6">
+            <view class="bottom1 flex-col"  v-if="order.orderStatus != 3">
                 <text class="allMoney"></text>
                 <view class="bottomBtn　flex-row justify-between">
                     <view class=" flex-row">
@@ -324,17 +324,8 @@ export default {
             uni.scanCode({
                 scanType: ['qrCode'],
                 success: function (res) {
-                    let json = JSON.parse(res.result)
-                    if(json.storeId != order.storeId){
-                        uni.showToast({
-                            icon: 'error',
-                            duration: 3000,
-                            title: '请扫描订单门店二维码'
-                        });
-                        return
-                    }
                     uni.navigateTo({
-                        url:'/orderPages/serviceItems/index?serviceStationId='+ json.stationId + '&orderId='+order.orderId + '&serviceObjectId=' + order.serviceObjectId
+                        url:'/orderPages/serviceItems/index?serviceStationId='+ res.result + '&orderId='+order.orderId + '&serviceObjectId=' + order.serviceObjectId
                     })
                 }
             })

pages/index/index.vue

@@ -29,7 +29,7 @@
               </view>
               <view class="text">
                 <view class="phone">{{ userInfo.cellPhone || ''}}</view>
-                <view class="welcome">尊敬的{{ userInfo.ncikName || ''}}，下午好~</view>
+<!--                <view class="welcome">尊敬的{{ userInfo.ncikName || ''}}，下午好~</view>-->
               </view>
               <view @click="gotoReceiveCoupons()" class="arrow-right">
                 <!-- <image v-if="userInfo.wxQrCode" class="qrcode" :src="userInfo.qrcode" mode=""></image> -->

storePages/notice/index.rpx.css

@@ -4,12 +4,19 @@
 .scroll-y{
     height: 95%;
     overflow: hidden;
-
 }
 .content-box {
     text-indent:2rem;
-    padding: 20rpx 20rpx;
+    padding: 20rpx 0rpx;
+}
+.noticeTitle{
+    margin-top: 30rpx;
+    margin-bottom: 20rpx;
+    text-align: center;
+    font-size: 40rpx;
 }
 .time{
     font-size: 28rpx;
+    color: #afafaf;
+
 }

storePages/notice/index.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="page">
-
-		<view class="flex-row justify-between">
-			<view class="time">
-				发布时间：<text>{{this.dateFormat(notice.createTime) }}</text>
-			</view>
+    <view class="noticeTitle" >{{notice.noticeTitle}}</view>
+		<view class="flex-row  justify-between" style="margin-bottom: 40rpx">
+      <view class="time">
+        发布人：<text>{{notice.createBy}}</text>
+      </view>
 			<view class="time">
-				发布人：<text>{{notice.createBy}}</text>
+				<text>{{this.dateFormat(notice.createTime) }}</text>
 			</view>
 		</view>
 		<scroll-view scroll-y="true" class="scroll-y " :style="{'height':height}">