xin

pages/group/group.vue

@@ -13,7 +13,7 @@
 			<u-dropdown v-if="tabIndex == 1" class="dropdown" ref="uDropdown" @open="open" @close="close">
 				<u-dropdown-item @change="clickItem" v-model="value0" title="售电公司" :options="electricityCompanys">
 				</u-dropdown-item>
-				<u-dropdown-item @change="clickItem" v-model="value1" title="现货收益比例" :options="ratio_xianhuo">
+				<u-dropdown-item @change="clickItem" v-model="value1" title="现货收益" :options="ratio_xianhuo">
 				</u-dropdown-item>
 				<u-dropdown-item @change="clickItem" v-model="value2" title="拼团类型" :options="groupTypes_xianhuo">
 				</u-dropdown-item>
@@ -501,6 +501,9 @@
 </script>
 
 <style lang="scss">
+	::v-deep .u-dropdown{
+		padding: 0 40rpx;
+	}
 	.group {
 		position: relative;
 		width: 100%;
@@ -517,8 +520,8 @@
 			font-weight: 400rpx;
 			color: #999;
 			background-color: #fff;
-			padding: 0 58rpx;
-
+			padding: 0 80rpx;
+			
 			.border {
 				color: #0099FF;
 				border-bottom: 4rpx solid #0099FF;

pages/index/index.vue

@@ -70,7 +70,7 @@
 		<view class="recommend" v-if="isEstablish &&recommendedPackageList.length > 0">
 			<view class="recommend_title" @click="linktoGroup">
 				<text>推荐套餐</text>
-				<view>查看详情<image src="https://fire.huoshitou.net/profile/icon/index_right.png" mode=""></image>
+				<view>查看详情<image src="https://fire.huoshitou.net/profile/icon/index_jt.png" mode=""></image>
 				</view>
 			</view>
 			<view class="recommend_item" v-for="(item, index) in recommendedPackageList" :key="index">
@@ -147,7 +147,7 @@
 		<view class="electriCompany" @click="linktoElectriCompany">
 			<view class="electriCompany_title">
 				入驻售电公司
-				<view>查看详情<image src="https://fire.huoshitou.net/profile/icon/index_right.png" mode=""></image>
+				<view>查看详情<image src="https://fire.huoshitou.net/profile/icon/index_jt.png" mode=""></image>
 				</view>
 			</view>
 			<view class="electriCompany_img">
@@ -159,7 +159,7 @@
 		<view class="regional" @click="toareaServe">
 			<view class="regional_title">
 				<view>区域服务中心</view>
-				<view class="more">查看详情 <image src="https://fire.huoshitou.net/profile/icon/index_right.png" mode="scaleToFill"></image>
+				<view class="more">查看详情 <image src="https://fire.huoshitou.net/profile/icon/index_jt.png" mode="scaleToFill"></image>
 				</view>
 			</view>
 			<view class="regional_main">
@@ -170,7 +170,7 @@
 		<view class="information">
 			<view class="information_title" @click="linktoInformation">
 				<text>行业资讯<!-- <text class="hyzx_xiao">关注实时 资讯不漏</text> --></text>
-				<view class="more">查看更多 <image src="https://fire.huoshitou.net/profile/icon/index_right.png" mode="scaleToFill"></image>
+				<view class="more">查看更多 <image src="https://fire.huoshitou.net/profile/icon/index_jt.png" mode="scaleToFill"></image>
 				</view>
 			</view>
 			<view class="information_item" v-for="(item,index) in salesInformationList" :key="index"
@@ -748,16 +748,16 @@
 				
 				view {
 					position: relative;
-					width: 98rpx;
-					font-size: 20rpx;
+					width: 118rpx;
+					font-size: 24rpx;
 					color: #999;
 				
 					image {
 						position: absolute;
-						top: 8rpx;
+						top: 6rpx;
 						right: 0;
-						width: 9rpx;
-						height: 15rpx;
+						width: 12rpx;
+						height: 20rpx;
 					}
 				}
 			}
@@ -906,16 +906,16 @@
 
 				view {
 					position: relative;
-					width: 98rpx;
-					font-size: 20rpx;
+					width: 118rpx;
+					font-size: 24rpx;
 					color: #999;
 
 					image {
 						position: absolute;
-						top: 8rpx;
+						top: 6rpx;
 						right: 0;
-						width: 9rpx;
-						height: 15rpx;
+						width: 12rpx;
+						height: 20rpx;
 					}
 				}
 			}
@@ -948,16 +948,16 @@
 
 				.more {
 					position: relative;
-					width: 98rpx;
-					font-size: 20rpx;
+					width: 118rpx;
+					font-size: 24rpx;
 					color: #999;
 
 					image {
 						position: absolute;
-						top: 8rpx;
+						top: 6rpx;
 						right: 0;
-						width: 9rpx;
-						height: 15rpx;
+						width: 12rpx;
+						height: 20rpx;
 					}
 				}
 			}
@@ -996,16 +996,16 @@
 
 				.more {
 					position: relative;
-					width: 98rpx;
-					font-size: 20rpx;
+					width: 118rpx;
+					font-size: 24rpx;
 					color: #999;
 
 					image {
 						position: absolute;
-						top: 4rpx;
+						top: 6rpx;
 						right: 0;
-						width: 9rpx;
-						height: 15rpx;
+						width: 12rpx;
+						height: 20rpx;
 					}
 				}
 			}

pages/login/login.vue

@@ -59,11 +59,11 @@
 				//ht=1 scene存量企业
 				if (scene2.indexOf('ht=') >= 0) {
 					that.culiangcontractId = split('=')[1]
-					uni.showToast({
-						title: that.culiangcontractId,
-						icon: 'none',
-						duration: 3000
-					})
+					// uni.showToast({
+					// 	title: that.culiangcontractId,
+					// 	icon: 'none',
+					// 	duration: 3000
+					// })
 				} else {
 					that.userId = scene2
 					//获取用户信息

pages/order/order.vue

@@ -365,7 +365,7 @@
 
 		.tab {
 			display: flex;
-			justify-content: space-around;
+			justify-content: space-between;
 			position: relative;
 			// margin-bottom: 5rpx;
 			width: 100%;
@@ -373,6 +373,7 @@
 			font-size: 30rpx;
 			text-align: center;
 			background-color: #fff;
+			padding: 0 80rpx;
 
 			.tab_child {
 				// flex: 1;
@@ -395,7 +396,7 @@
 		.select {
 			display: flex;
 			align-items: center;
-			padding-left: 112rpx;
+			padding-left: 80rpx;
 			margin-bottom: 10rpx;
 			height: 70rpx;
 			background-color: #fff;

pages/register/register.vue

@@ -233,7 +233,12 @@
 			}
 			//存量企业
 			if(options.culiangcontractId){
-				this.scene = JSON.stringify(options.culiangcontractId)
+				let that=this
+				if(options.culiangcontractId.indexOf('"')>=0){
+					that.scene = options.culiangcontractId.replace(/\"/g, "")
+				}else{
+					that.scene = options.culiangcontractId
+				}
 				this.inviteType =100
 			}
 			console.log('接受邀请的合同id=', this.contractId)

pagesA/MyServeOeder/ServeOrder.vue

@@ -466,7 +466,7 @@
 
 		//下拉
 		.u-dropdown__menu__item {
-			padding-left: 32rpx;
+			padding-left: 62rpx;
 			justify-content: flex-start !important;
 		}
 

pagesA/requirements/requirements.vue

@@ -470,7 +470,7 @@
 								margin-right: 10rpx;
 								margin-top: 10rpx;
 								overflow: hidden;
-								width: 21rpx;
+								width: 20rpx;
 								height: 20rpx;
 								background-color: #1989fa;
 								border-radius:50%;

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/pages/group/group.wxss

@@ -24,6 +24,9 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+ .u-dropdown {
+  padding: 0 40rpx;
+}
 .group {
   position: relative;
   width: 100%;
@@ -43,7 +46,7 @@
   font-weight: 400rpx;
   color: #999;
   background-color: #fff;
-  padding: 0 58rpx;
+  padding: 0 80rpx;
 }
 .group .group_title .border {
   color: #0099FF;

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -240,16 +240,16 @@
 }
 .index .recommend .recommend_title view {
   position: relative;
-  width: 98rpx;
-  font-size: 20rpx;
+  width: 118rpx;
+  font-size: 24rpx;
   color: #999;
 }
 .index .recommend .recommend_title view image {
   position: absolute;
-  top: 8rpx;
+  top: 6rpx;
   right: 0;
-  width: 9rpx;
-  height: 15rpx;
+  width: 12rpx;
+  height: 20rpx;
 }
 .index .recommend .recommend_item {
   padding: 0 32rpx;
@@ -393,16 +393,16 @@
 }
 .index .electriCompany .electriCompany_title view {
   position: relative;
-  width: 98rpx;
-  font-size: 20rpx;
+  width: 118rpx;
+  font-size: 24rpx;
   color: #999;
 }
 .index .electriCompany .electriCompany_title view image {
   position: absolute;
-  top: 8rpx;
+  top: 6rpx;
   right: 0;
-  width: 9rpx;
-  height: 15rpx;
+  width: 12rpx;
+  height: 20rpx;
 }
 .index .electriCompany .electriCompany_img {
   height: 340rpx;
@@ -434,16 +434,16 @@
 }
 .index .regional .regional_title .more {
   position: relative;
-  width: 98rpx;
-  font-size: 20rpx;
+  width: 118rpx;
+  font-size: 24rpx;
   color: #999;
 }
 .index .regional .regional_title .more image {
   position: absolute;
-  top: 8rpx;
+  top: 6rpx;
   right: 0;
-  width: 9rpx;
-  height: 15rpx;
+  width: 12rpx;
+  height: 20rpx;
 }
 .index .regional .regional_main {
   height: 340rpx;
@@ -480,16 +480,16 @@
 }
 .index .information .information_title .more {
   position: relative;
-  width: 98rpx;
-  font-size: 20rpx;
+  width: 118rpx;
+  font-size: 24rpx;
   color: #999;
 }
 .index .information .information_title .more image {
   position: absolute;
-  top: 4rpx;
+  top: 6rpx;
   right: 0;
-  width: 9rpx;
-  height: 15rpx;
+  width: 12rpx;
+  height: 20rpx;
 }
 .index .information .information_item {
   padding: 32rpx 0;

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -217,15 +217,15 @@ var _fun = __webpack_require__(/*! ../../static/util/fun.js */ 50);function _int
 var _default = { onLoad: function onLoad(options) {uni.hideHomeButton();var that = this;console.log(options); //有scene从分享海报邀请进来的
     if (options.scene) {// scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
       var scene = decodeURIComponent(options.scene);that.inviteType = scene.split('&&')[0];var scene2 = JSON.stringify(scene.split('&&')[1]); //ht=1 scene存量企业
-      if (scene2.indexOf('ht=') >= 0) {that.culiangcontractId = split('=')[1];uni.showToast({ title: that.culiangcontractId, icon: 'none', duration: 3000 });} else {that.userId = scene2; //获取用户信息
-        (0, _fun.get)(_api.default.getUserInformation, { type: '2', userId: that.userId }).then(function (res) {if (res.code == 200) {that.inviteCode = res.data.inviteCode;} else {uni.showToast({ title: res.msg, icon: 'none', duration: 1200 });}});}} else {that.inviteType = options.inviteType;that.inviteCode = options.inviteCode;}this.contractId = options.contractId;
-    this.inviterUserId = options.inviterUserId ? options.inviterUserId : '';
-    this.roleId = options.roleId ? options.roleId : '';
-    // this.roleId = 19
+      if (scene2.indexOf('ht=') >= 0) {that.culiangcontractId = split('=')[1]; // uni.showToast({
+        // 	title: that.culiangcontractId,
+        // 	icon: 'none',
+        // 	duration: 3000
+        // })
+      } else {that.userId = scene2; //获取用户信息
+        (0, _fun.get)(_api.default.getUserInformation, { type: '2', userId: that.userId }).then(function (res) {if (res.code == 200) {that.inviteCode = res.data.inviteCode;} else {uni.showToast({ title: res.msg, icon: 'none', duration: 1200 });}});}} else {that.inviteType = options.inviteType;that.inviteCode = options.inviteCode;}this.contractId = options.contractId;this.inviterUserId = options.inviterUserId ? options.inviterUserId : '';this.roleId = options.roleId ? options.roleId : ''; // this.roleId = 19
     // this.inviterUserId = 132
-    if (this.inviteType || this.inviterUserId || this.roleId) {
-      this.isCreated = false;
-    }
+    if (this.inviteType || this.inviterUserId || this.roleId) {this.isCreated = false;}
     // console.log('inviteType:', this.inviteType)
     // console.log('inviteCode:', this.inviteCode)
     // console.log('contractId:', this.contractId)

unpackage/dist/dev/mp-weixin/pages/order/order.wxss

@@ -92,14 +92,16 @@
   display: -webkit-box;
   display: -webkit-flex;
   display: flex;
-  -webkit-justify-content: space-around;
-          justify-content: space-around;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+          justify-content: space-between;
   position: relative;
   width: 100%;
   color: #999;
   font-size: 30rpx;
   text-align: center;
   background-color: #fff;
+  padding: 0 80rpx;
 }
 .order .tab .tab_child.data-v-127632e4 {
   height: 95rpx;
@@ -121,7 +123,7 @@
   -webkit-box-align: center;
   -webkit-align-items: center;
           align-items: center;
-  padding-left: 112rpx;
+  padding-left: 80rpx;
   margin-bottom: 10rpx;
   height: 70rpx;
   background-color: #fff;

unpackage/dist/dev/mp-weixin/pages/register/register.js

@@ -375,7 +375,12 @@ var _fun = __webpack_require__(/*! ../../static/util/fun.js */ 50);function _int
     }
     //存量企业
     if (options.culiangcontractId) {
-      this.scene = JSON.stringify(options.culiangcontractId);
+      var that = this;
+      if (options.culiangcontractId.indexOf('"') >= 0) {
+        that.scene = options.culiangcontractId.replace(/\"/g, "");
+      } else {
+        that.scene = options.culiangcontractId;
+      }
       this.inviteType = 100;
     }
     console.log('接受邀请的合同id=', this.contractId);

unpackage/dist/dev/mp-weixin/pagesA/MyServeOeder/ServeOrder.wxss

@@ -84,7 +84,7 @@
   height: 28rpx;
 }
 .ServeOrder .u-dropdown__menu__item {
-  padding-left: 32rpx;
+  padding-left: 62rpx;
   -webkit-box-pack: start !important;
   -webkit-justify-content: flex-start !important;
           justify-content: flex-start !important;

unpackage/dist/dev/mp-weixin/pagesA/requirements/requirements.wxss

@@ -251,7 +251,7 @@
   margin-right: 10rpx;
   margin-top: 10rpx;
   overflow: hidden;
-  width: 21rpx;
+  width: 20rpx;
   height: 20rpx;
   background-color: #1989fa;
   -webkit-border-radius: 50%;

unpackage/dist/dev/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": 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' // 登录