xin

manifest.json

@@ -73,7 +73,7 @@
                 "provider" : "wxaf8f505686ddf66a"
             }
         },
-        "appid" : "wxb21370ac25ee51b0",
+        "appid" : "wx45bb68de16ddddb7",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

static/util/api.js

 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
 // const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
-// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
+const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
 // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
-const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
+// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
 const HOST = DOMAIN + 'api/'
 
 erp.login = HOST + 'loginAndRegister/login' // 登录

unpackage/dist/build/mp-weixin/components/bottomWindow/bottomWindow.js

-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/bottomWindow/bottomWindow"],{"1c05":function(e,t,o){"use strict";o.r(t);var n=o("2f90"),a=o.n(n);for(var c in n)"default"!==c&&function(e){o.d(t,e,(function(){return n[e]}))}(c);t["default"]=a.a},"2f90":function(e,t,o){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n=o("86df"),a=c(o("9036"));function c(e){return e&&e.__esModule?e:{default:e}}var s={props:{type:{type:Number,default:0},packageId:{type:Number,default:0}},data:function(){return{dialogShow:!1,saveurl:""}},onLoad:function(){},methods:{onShareAppMessage:function(e){return{title:"张晓敏邀请您绑定成为他的用电企业会员",path:"/pages/login/login?id=张晓敏",imageUrl:"https://fire.huoshitou.net/profile/icon/yaoqing.png",content:"邀请您绑定成为他的用电企业会员",desc:"电客",success:function(e){console.log("111111"),console.log(e)},fail:function(e){console.log("222222"),console.log(e)}}},save:function(){var t=this,o=(e.getStorageSync("type"),e.getStorageSync("user").electricId);if(console.log("that.type",t.type),1==t.type){e.getStorageSync("user").inviteCode;(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"3&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))}else 2==t.type?(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/group/groupInfo",scene:t.packageId}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))):3==t.type&&(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"33&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})})))},saveimg:function(t){var o=this;e.downloadFile({url:t,success:function(t){200===t.statusCode&&e.saveImageToPhotosAlbum({filePath:t.tempFilePath,success:function(){o.dialogShow=!0,console.log()},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},cancleModel:function(){this.$emit("closeModel","closeModel")}}};t.default=s}).call(this,o("543d")["default"])},"36d7":function(e,t,o){},"54aa":function(e,t,o){"use strict";o.r(t);var n=o("78ac"),a=o("1c05");for(var c in a)"default"!==c&&function(e){o.d(t,e,(function(){return a[e]}))}(c);o("bd82");var s,i=o("f0c5"),l=Object(i["a"])(a["default"],n["b"],n["c"],!1,null,null,null,!1,n["a"],s);t["default"]=l.exports},"78ac":function(e,t,o){"use strict";var n;o.d(t,"b",(function(){return a})),o.d(t,"c",(function(){return c})),o.d(t,"a",(function(){return n}));var a=function(){var e=this,t=e.$createElement;e._self._c},c=[]},bd82:function(e,t,o){"use strict";var n=o("36d7"),a=o.n(n);a.a}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/bottomWindow/bottomWindow"],{"2bba":function(e,t,o){"use strict";o.r(t);var n=o("cf5e"),a=o.n(n);for(var c in n)"default"!==c&&function(e){o.d(t,e,(function(){return n[e]}))}(c);t["default"]=a.a},"47a0":function(e,t,o){"use strict";var n;o.d(t,"b",(function(){return a})),o.d(t,"c",(function(){return c})),o.d(t,"a",(function(){return n}));var a=function(){var e=this,t=e.$createElement;e._self._c},c=[]},9537:function(e,t,o){"use strict";o.r(t);var n=o("47a0"),a=o("2bba");for(var c in a)"default"!==c&&function(e){o.d(t,e,(function(){return a[e]}))}(c);o("cff6");var s,l=o("f0c5"),i=Object(l["a"])(a["default"],n["b"],n["c"],!1,null,null,null,!1,n["a"],s);t["default"]=i.exports},cf5e:function(e,t,o){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n=o("a000"),a=c(o("7363"));function c(e){return e&&e.__esModule?e:{default:e}}var s={props:{type:{type:Number,default:0},packageId:{type:Number,default:0}},data:function(){return{dialogShow:!1,saveurl:""}},onLoad:function(){},methods:{onShareAppMessage:function(e){return{title:"张晓敏邀请您绑定成为他的用电企业会员",path:"/pages/login/login?id=张晓敏",imageUrl:"https://fire.huoshitou.net/profile/icon/yaoqing.png",content:"邀请您绑定成为他的用电企业会员",desc:"电客",success:function(e){console.log("111111"),console.log(e)},fail:function(e){console.log("222222"),console.log(e)}}},save:function(){var t=this,o=(e.getStorageSync("type"),e.getStorageSync("user").electricId);if(console.log("that.type",t.type),1==t.type){e.getStorageSync("user").inviteCode;(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"3&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))}else 2==t.type?(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/group/groupInfo",scene:t.packageId}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))):3==t.type&&(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"33&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})})))},saveimg:function(t){console.log(t);var o=t.replace("httpss:","https:"),n=this;e.downloadFile({url:o,success:function(t){200===t.statusCode&&e.saveImageToPhotosAlbum({filePath:t.tempFilePath,success:function(){n.dialogShow=!0,console.log()},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},cancleModel:function(){this.$emit("closeModel","closeModel")}}};t.default=s}).call(this,o("543d")["default"])},cff6:function(e,t,o){"use strict";var n=o("e2e4"),a=o.n(n);a.a},e2e4:function(e,t,o){}}]);
->>>>>>> 2a661a7155a13f2e758bcf800229042b176c3554
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/bottomWindow/bottomWindow"],{"0b56":function(e,t,o){"use strict";var n;o.d(t,"b",(function(){return a})),o.d(t,"c",(function(){return s})),o.d(t,"a",(function(){return n}));var a=function(){var e=this,t=e.$createElement;e._self._c},s=[]},"1c05":function(e,t,o){"use strict";o.r(t);var n=o("2f90"),a=o.n(n);for(var s in n)"default"!==s&&function(e){o.d(t,e,(function(){return n[e]}))}(s);t["default"]=a.a},"2f90":function(e,t,o){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n=o("86df"),a=s(o("9036"));function s(e){return e&&e.__esModule?e:{default:e}}var c={props:{type:{type:Number,default:0},packageId:{type:Number,default:0}},data:function(){return{dialogShow:!1,saveurl:""}},onLoad:function(){},methods:{onShareAppMessage:function(e){return{title:"张晓敏邀请您绑定成为他的用电企业会员",path:"/pages/login/login?id=张晓敏",imageUrl:"https://fire.huoshitou.net/profile/icon/yaoqing.png",content:"邀请您绑定成为他的用电企业会员",desc:"电客",success:function(e){console.log("111111"),console.log(e)},fail:function(e){console.log("222222"),console.log(e)}}},save:function(){var t=this,o=(e.getStorageSync("type"),e.getStorageSync("user").electricId);if(console.log("that.type",t.type),1==t.type){e.getStorageSync("user").inviteCode;(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"3&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))}else 2==t.type?(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/group/groupInfo",scene:t.packageId}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})}))):3==t.type&&(console.log("that.packageId",t.packageId),(0,n.get)(a.default.getWxCode,{page:"pages/login/login",scene:"33&&"+o}).then((function(o){200==o.code?(t.saveurl=o.msg,t.saveimg(t.saveurl)):e.showToast({title:o.msg,icon:"none"})})))},saveimg:function(t){console.log(t);var o=t.replace("httpss:","https:"),n=this;e.downloadFile({url:o,success:function(t){200===t.statusCode&&e.saveImageToPhotosAlbum({filePath:t.tempFilePath,success:function(){n.dialogShow=!0,console.log()},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},fail:function(){e.showToast({title:"保存失败",icon:"none"})}})},cancleModel:function(){this.$emit("closeModel","closeModel")}}};t.default=c}).call(this,o("543d")["default"])},"36d7":function(e,t,o){},"54aa":function(e,t,o){"use strict";o.r(t);var n=o("0b56"),a=o("1c05");for(var s in a)"default"!==s&&function(e){o.d(t,e,(function(){return a[e]}))}(s);o("bd82");var c,l=o("f0c5"),i=Object(l["a"])(a["default"],n["b"],n["c"],!1,null,null,null,!1,n["a"],c);t["default"]=i.exports},bd82:function(e,t,o){"use strict";var n=o("36d7"),a=o.n(n);a.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/bottomWindow/bottomWindow-create-component',
     {

unpackage/dist/build/mp-weixin/pages/myInfo/retailTrade.json

 {
-  "navigationBarTitleText": "结算交易单",
+  "navigationBarTitleText": "结算联系单",
   "enablePullDownRefresh": false,
   "usingComponents": {
     "select-compoment": "/components/selectCompoment/index"

unpackage/dist/build/mp-weixin/project.config.json

@@ -6,28 +6,54 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
+    "enhance": false,
     "postcss": true,
-    "minified": true
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "bundle": false,
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "wxb21370ac25ee51b0",
+  "appid": "wx45bb68de16ddddb7",
   "projectname": "gangshi",
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": -1,
       "list": []
     }
   }

unpackage/dist/build/mp-weixin/static/util/api.js

 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
 // const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
-// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
+const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
 // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
-const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
+// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
 const HOST = DOMAIN + 'api/'
 
 erp.login = HOST + 'loginAndRegister/login' // 登录

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -16441,10 +16441,10 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
 // const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
-// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
+var DOMAIN = 'https://dev.diaosaas.com/diaoyun/'; //测试
 // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
-var DOMAIN = 'https://fire.huoshitou.net/diaoyun/'; // 正式
+// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
 var HOST = DOMAIN + 'api/';
 
 erp.login = HOST + 'loginAndRegister/login'; // 登录

unpackage/dist/dev/mp-weixin/project.config.json

@@ -11,23 +11,19 @@
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "wxb21370ac25ee51b0",
+  "appid": "wx45bb68de16ddddb7",
   "projectname": "gangshi",
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": 0,
       "list": [
         {
           "name": "",

unpackage/dist/dev/mp-weixin/static/util/api.js

 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
 // const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
-// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
+const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
 // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
-const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
+// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
 const HOST = DOMAIN + 'api/'
 
 erp.login = HOST + 'loginAndRegister/login' // 登录