Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -80,7 +80,7 @@
 					直接出库
 				</button>
 				<button class="admin-button-com middle" @click="confirmStockOutOrder">
-					保存
+					保存草稿
 				</button>
 			</view>
 		</view>

hdApp/src/pagesPurchase/wechatPay.vue

@@ -143,22 +143,19 @@ export default {
     getError () {
     },
     _balancePay () {
-      console.log('this.getLoginInfo===>', this.getLoginInfo, this.getDictionariesInfo)
+      let self = this
       if (this.getLoginInfo.payPassword) {
         this.keyShow = true
       } else {
         uni.showModal({
           title: '',
-          content: '即将前往设置密码页面',
+          content: '请先设置支付密码',
           success: function (res) {
             if (res.confirm) {
-              console.log('用户点击确定');
-              this.pageTo({
+              self.pageTo({
                 url: '/pagesPurchase/setPsd',
                 type: 2
               })
-            } else if (res.cancel) {
-              console.log('用户点击取消');
             }
           }
         });