Merge branch 'master' of https://dkb.xmyuedian.com/18016688350/agent-vending-machine

pages/agent/add.js

@@ -101,12 +101,14 @@ Page({
     if (!checkRes) {
       var that = this
       util.request(util.api.agentAdd, that.data.user, "POST", false, true,app.globalData.token).then((res)=>{
+        console.log("22222222222",res)
         if (res.code == 200) {
           wx.navigateTo({
             url: '/pages/agent/index',
           })
         }else{
-          util.toast("该代理或联系方式已存在,请重新输入")
+          console.log("1111111111")
+          util.toast(res.message)
         }
       }).catch((res) => {})
     } else {

pages/billing/index.js

@@ -122,7 +122,6 @@ Page({
   },
   getList() {
     var that = this
-
     utils.request(utils.api.mgVmBillList, that.data.searchParams, "GET", true, false, app.globalData.token).then((res) => {
       if (res.code == 200) {
         if (res.result.records.length > 0) {

pages/billing/index.wxml

@@ -9,7 +9,7 @@
   </tui-list-cell>
     <tui-list-cell hover="{{false}}">
       <view class="tui-line-cell">
-        <view class="tui-title">总额</view>
+        <view class="tui-title">总额</view> 
         <label class="tui-lable">{{totalAmount}}元</label>
       </view>
     </tui-list-cell>

pages/login/index.wxml

@@ -2,7 +2,7 @@
   <view class="tui-bg-box">
     <image src="../../static/images/my/bg_login.png" class="tui-bg-img"></image>
     <image src="../../static/images/my/mengguo192.png" class="tui-photo"></image>
-    <view class="tui-login-name">梦果售货机</view>
+    <view class="tui-login-name" style="flex-wrap:nowrap;width: auto;" >梦果售货机</view>
   </view>
   <form bindsubmit="login">
     <view class="tui-login-from">

pages/store/add.js

@@ -195,12 +195,14 @@ Page({
     if (!checkRes) {
       
       util.request(util.api.addStore, that.data.storeInfo, "POST", false, true,app.globalData.token).then((res)=>{
+        console.log("111111",res)
         if (res.code == 200) {
           wx.navigateTo({
             url: '/pages/store/index',
           })
+          console.log("22222")
         }else{
-          util.toast("该门店名称已存在,请重新输入")
+          util.toast(res.message)
         }
       }).catch((res) => {})
     } else {

project.config.json

@@ -1,44 +1,33 @@
 {
-    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "setting": {
-        "urlCheck": true,
-        "es6": false,
-        "enhance": true,
-        "postcss": true,
-        "preloadBackgroundData": false,
-        "minified": true,
-        "newFeature": false,
-        "coverView": true,
-        "nodeModules": true,
-        "autoAudits": false,
-        "showShadowRootInWxmlPanel": true,
-        "scopeDataCheck": false,
-        "uglifyFileName": true,
-        "checkInvalidKey": true,
-        "checkSiteMap": true,
-        "uploadWithSourceMap": true,
-        "compileHotReLoad": false,
-        "useMultiFrameRuntime": true,
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        },
-        "useIsolateContext": true,
-        "useCompilerModule": true,
-        "userConfirmedUseCompilerModuleSwitch": false,
-        "packNpmManually": false,
-        "packNpmRelationList": [],
-        "lazyloadPlaceholderEnable": false,
-        "userConfirmedBundleSwitch": false,
-        "minifyWXSS": true,
-        "disableUseStrict": false,
-        "showES6CompileOption": false,
-        "useCompilerPlugins": false,
-        "ignoreUploadUnusedFiles": true,
-        "minifyWXML": true,
-        "useStaticServer": true
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "setting": {
+    "urlCheck": false,
+    "es6": false,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": true,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": true,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     },
+<<<<<<< HEAD
     "compileType": "miniprogram",
     "simulatorType": "wechat",
     "simulatorPluginLibVersion": {},
@@ -54,4 +43,30 @@
     },
     "appid": "wxc42df73f9710a566",
     "projectname": "mg-vending-machine-applets-manage"
+=======
+    "useIsolateContext": true,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true
+  },
+  "compileType": "miniprogram",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 4
+  },
+  "libVersion": "2.24.5",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wxc42df73f9710a566",
+  "condition": {}
 }