Merge branch 'master' of https://git.hshuishang.com/qiaojiale/uniapp-ZHSQ into feature/yi

packages/shop/submitOrder/index.vue

@@ -62,7 +62,7 @@
 
 
         <div class="footer">
-            <div class="btn" @click="craeteOrder">立即支付￥{{ totalMony }}</div>
+            <div class="btn">立即支付￥{{ totalMony }}</div>
         </div>
 
     </view>
@@ -173,7 +173,7 @@ export default {
             uni.requestPayment({
                 "provider": "wxpay",
                 "orderInfo": {
-                    "appid": "wxb4018c78fa143450",  // 
+                    "appid": "wxb4018c78fa143450",  //
                     "noncestr": resCopy.nonceStr, // 随机字符串
                     "package": resCopy.package,        // 固定值
                     "prepayid":resCopy.prepayId,

packages/workOrderDashboard/index/index.vue

@@ -82,7 +82,7 @@
     </div>
 
 	</view>
-</template>
+</template> 
 
 <script>
 import { request, NavgateTo, menuButtonInfo } from '../../../utils';