Lianxun_Vue.git

parent: a5596b41 | 补丁 | 提交 | ignore whitespace

jialh

2025-08-22 c4ef86743268562bd97308ba6cf8012f2decde5d

更新

5个文件已修改

	app.js	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/components/property/addActivitiesView/addActivitiesView.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/pages/property/activitiesTypeManage/activitiesTypeManage.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/pages/property/payFeeOrder/payFeeOrder.html	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/pages/property/payFeeOrder/payFeeOrder.js	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app.js

@@ -57,14 +57,14 @@
// app.use('/app', proxy('http://192.168.100.109:8008', opts));

// todo 本机 开发用，生产环境请用nginx带来
// app.use('/ws', proxy('http://192.168.31.222:8008', opts));
// app.use('/callComponent', proxy('http://192.168.31.222:8008', opts));
// app.use('/app', proxy('http://192.168.31.222:8008', opts));
app.use('/ws', proxy('http://192.168.31.222:8008', opts));
app.use('/callComponent', proxy('http://192.168.31.222:8008', opts));
app.use('/app', proxy('http://192.168.31.222:8008', opts));

// todo 本机 开发用，生产环境请用nginx带来
app.use('/ws', proxy('http://47.92.223.85:8008', opts));
app.use('/callComponent', proxy('http://47.92.223.85:8008', opts));
app.use('/app', proxy('http://47.92.223.85:8008', opts));
// app.use('/ws', proxy('http://47.92.223.85:8008', opts));
// app.use('/callComponent', proxy('http://47.92.223.85:8008', opts));
// app.use('/app', proxy('http://47.92.223.85:8008', opts));

//app.listen(3000);
app.use(express.json());

 public/components/property/addActivitiesView/addActivitiesView.html

@@ -30,7 +30,7 @@
                        </select>
                    </div>
                </div>
                <!-- <div class="form-group row">
                <div class="form-group row">
                    <label class="col-sm-2 col-form-label">
                        <span><vc:i18n name="多小区" namespace="addActivitiesView"></vc:i18n></span>
                    </label>
@@ -41,7 +41,7 @@
                            <option value="N">{{vc.i18n('否','addActivitiesView')}}</option>
                        </select>
                    </div>
                </div> -->
                </div>
                <div class="form-group row">
                    <label class="col-sm-2 col-form-label">
                        <span><vc:i18n name="头部照片" namespace="addActivitiesView"></vc:i18n></span>(800 * 595)

 public/pages/property/activitiesTypeManage/activitiesTypeManage.js

@@ -35,6 +35,7 @@
            _listActivitiesTypes: function (_page, _rows) {
                vc.component.activitiesTypeManageInfo.conditions.page = _page;
                vc.component.activitiesTypeManageInfo.conditions.row = _rows;
                vc.component.activitiesTypeManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
                var param = {
                    params: vc.component.activitiesTypeManageInfo.conditions
                };

 public/pages/property/payFeeOrder/payFeeOrder.html

@@ -48,12 +48,27 @@
                            <label class=" col-form-label ">{{payFeeOrderInfo.feeTypeCdName}}</label>
                        </div>
                        <label class="col-sm-2 col-form-label padding-l-60">
                            <vc:i18n name="计费起始时间:" namespace="payFeeOrder"></vc:i18n>
                            <vc:i18n name="应收计费时间起止:" namespace="payFeeOrder"></vc:i18n>
                        </label>
                        <div class="col-sm-4">
                            <label class=" col-form-label ">{{payFeeOrderInfo.endTime}}</label>
                            <label class=" col-form-label ">{{payFeeOrderInfo.payStartDate.split(' ')[0]}}~{{payFeeOrderInfo.payEndDate.split(' ')[0]}}</label>

                        </div>
                    </div>
                    <!-- <div class="form-group row">
                        <label class="col-sm-2 col-form-label padding-l-60">
                            <vc:i18n name="收费截止时间:" namespace="payFeeOrder"></vc:i18n>
                        </label>
                        <div class="col-sm-4">
                            <label class=" col-form-label ">{{payFeeOrderInfo.deadlineTime}}</label>
                        </div>
                        <label class="col-sm-2 col-form-label padding-l-60">
                            <vc:i18n name="计费结束时间:" namespace="payFeeOrder"></vc:i18n>
                        </label>
                        <div class="col-sm-4">
                            <label class=" col-form-label ">{{payFeeOrderInfo.deadlineTime}}</label>
                        </div>
                    </div> -->
                    <div class="form-group row" v-if="payFeeOrderInfo.builtUpArea">
                        <label class="col-sm-2 col-form-label padding-l-60">
                            <vc:i18n name="面积:" namespace="payFeeOrder"></vc:i18n>
@@ -76,6 +91,13 @@
                        <div class="col-sm-4">
                            <label class="col-form-label ">{{payFeeOrderInfo.additionalAmount}}</label>
                        </div>
                        <label class="col-sm-2 col-form-label padding-l-60">
                            <vc:i18n name="费用计费时间起止:" namespace="payFeeOrder"></vc:i18n>
                        </label>
                        <div class="col-sm-4">
                            <label class=" col-form-label ">{{payFeeOrderInfo.startTime.split(' ')[0]}}~{{payFeeOrderInfo.maxEndTime.split(' ')[0]}}</label>

                        </div>
                    </div>
                    <div class="form-group row" v-else>
                        <label class="col-sm-2 col-form-label padding-l-60">
@@ -83,6 +105,13 @@
                        </label>
                        <div class="col-sm-4">
                            <label class=" col-form-label ">{{payFeeOrderInfo.additionalAmount}}</label>
                        </div>
                        <label class="col-sm-2 col-form-label padding-l-60">
                            <vc:i18n name="费用计费时间起止:" namespace="payFeeOrder"></vc:i18n>
                        </label>
                        <div class="col-sm-4">
                            <label class=" col-form-label ">{{payFeeOrderInfo.startTime.split(' ')[0]}}~{{payFeeOrderInfo.maxEndTime.split(' ')[0]}}</label>

                        </div>
                    </div>
                    <div class="form-group row">
@@ -115,7 +144,7 @@
                        </div>
                        <label class="col-sm-2 col-form-label padding-l-60"
                            style="line-height: 50px;padding-right:0px;">
                            <vc:i18n name="应缴金额:" namespace="payFeeOrder"></vc:i18n>
                            <vc:i18n name="实缴金额:" namespace="payFeeOrder"></vc:i18n>
                        </label>
                        <div class="col-sm-4">
                            <label class="col-form-label " style="font-size: 30px;color: red;padding-left:0px;">

 public/pages/property/payFeeOrder/payFeeOrder.js

@@ -12,6 +12,11 @@
                primeRates: '',
                primeRate: '',
                endTime: '',
                payStartDate: '',
                payEndDate: '',
                maxEndTime: '',
                startTime: [],

                feeFlag: '',
                feePrice: 0.00,
                tempCycles: '',

			@@ -57,14 +57,14 @@
			// app.use('/app', proxy('http://192.168.100.109:8008', opts));

			// todo 本机开发用，生产环境请用nginx带来
			// app.use('/ws', proxy('http://192.168.31.222:8008', opts));
			// app.use('/callComponent', proxy('http://192.168.31.222:8008', opts));
			// app.use('/app', proxy('http://192.168.31.222:8008', opts));
			app.use('/ws', proxy('http://192.168.31.222:8008', opts));
			app.use('/callComponent', proxy('http://192.168.31.222:8008', opts));
			app.use('/app', proxy('http://192.168.31.222:8008', opts));

			// todo 本机开发用，生产环境请用nginx带来
			app.use('/ws', proxy('http://47.92.223.85:8008', opts));
			app.use('/callComponent', proxy('http://47.92.223.85:8008', opts));
			app.use('/app', proxy('http://47.92.223.85:8008', opts));
			// app.use('/ws', proxy('http://47.92.223.85:8008', opts));
			// app.use('/callComponent', proxy('http://47.92.223.85:8008', opts));
			// app.use('/app', proxy('http://47.92.223.85:8008', opts));

			//app.listen(3000);
			app.use(express.json());

			@@ -30,7 +30,7 @@
			</select>
			</div>
			</div>
			<!-- <div class="form-group row">
			<div class="form-group row">
			<label class="col-sm-2 col-form-label">
			<span><vc:i18n name="多小区" namespace="addActivitiesView"></vc:i18n></span>
			</label>
			@@ -41,7 +41,7 @@
			<option value="N">{{vc.i18n('否','addActivitiesView')}}</option>
			</select>
			</div>
			</div> -->
			</div>
			<div class="form-group row">
			<label class="col-sm-2 col-form-label">
			<span><vc:i18n name="头部照片" namespace="addActivitiesView"></vc:i18n></span>(800 * 595)

			@@ -35,6 +35,7 @@
			_listActivitiesTypes: function (_page, _rows) {
			vc.component.activitiesTypeManageInfo.conditions.page = _page;
			vc.component.activitiesTypeManageInfo.conditions.row = _rows;
			vc.component.activitiesTypeManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
			var param = {
			params: vc.component.activitiesTypeManageInfo.conditions
			};

			@@ -48,12 +48,27 @@
			<label class=" col-form-label ">{{payFeeOrderInfo.feeTypeCdName}}</label>
			</div>
			<label class="col-sm-2 col-form-label padding-l-60">
			<vc:i18n name="计费起始时间:" namespace="payFeeOrder"></vc:i18n>
			<vc:i18n name="应收计费时间起止:" namespace="payFeeOrder"></vc:i18n>
			</label>
			<div class="col-sm-4">
			<label class=" col-form-label ">{{payFeeOrderInfo.endTime}}</label>
			<label class=" col-form-label ">{{payFeeOrderInfo.payStartDate.split(' ')[0]}}~{{payFeeOrderInfo.payEndDate.split(' ')[0]}}</label>

			</div>
			</div>
			<!-- <div class="form-group row">
			<label class="col-sm-2 col-form-label padding-l-60">
			<vc:i18n name="收费截止时间:" namespace="payFeeOrder"></vc:i18n>
			</label>
			<div class="col-sm-4">
			<label class=" col-form-label ">{{payFeeOrderInfo.deadlineTime}}</label>
			</div>
			<label class="col-sm-2 col-form-label padding-l-60">
			<vc:i18n name="计费结束时间:" namespace="payFeeOrder"></vc:i18n>
			</label>
			<div class="col-sm-4">
			<label class=" col-form-label ">{{payFeeOrderInfo.deadlineTime}}</label>
			</div>
			</div> -->
			<div class="form-group row" v-if="payFeeOrderInfo.builtUpArea">
			<label class="col-sm-2 col-form-label padding-l-60">
			<vc:i18n name="面积:" namespace="payFeeOrder"></vc:i18n>
			@@ -76,6 +91,13 @@
			<div class="col-sm-4">
			<label class="col-form-label ">{{payFeeOrderInfo.additionalAmount}}</label>
			</div>
			<label class="col-sm-2 col-form-label padding-l-60">
			<vc:i18n name="费用计费时间起止:" namespace="payFeeOrder"></vc:i18n>
			</label>
			<div class="col-sm-4">
			<label class=" col-form-label ">{{payFeeOrderInfo.startTime.split(' ')[0]}}~{{payFeeOrderInfo.maxEndTime.split(' ')[0]}}</label>

			</div>
			</div>
			<div class="form-group row" v-else>
			<label class="col-sm-2 col-form-label padding-l-60">
			@@ -83,6 +105,13 @@
			</label>
			<div class="col-sm-4">
			<label class=" col-form-label ">{{payFeeOrderInfo.additionalAmount}}</label>
			</div>
			<label class="col-sm-2 col-form-label padding-l-60">
			<vc:i18n name="费用计费时间起止:" namespace="payFeeOrder"></vc:i18n>
			</label>
			<div class="col-sm-4">
			<label class=" col-form-label ">{{payFeeOrderInfo.startTime.split(' ')[0]}}~{{payFeeOrderInfo.maxEndTime.split(' ')[0]}}</label>

			</div>
			</div>
			<div class="form-group row">
			@@ -115,7 +144,7 @@
			</div>
			<label class="col-sm-2 col-form-label padding-l-60"
			style="line-height: 50px;padding-right:0px;">
			<vc:i18n name="应缴金额:" namespace="payFeeOrder"></vc:i18n>
			<vc:i18n name="实缴金额:" namespace="payFeeOrder"></vc:i18n>
			</label>
			<div class="col-sm-4">
			<label class="col-form-label " style="font-size: 30px;color: red;padding-left:0px;">

			@@ -12,6 +12,11 @@
			primeRates: '',
			primeRate: '',
			endTime: '',
			payStartDate: '',
			payEndDate: '',
			maxEndTime: '',
			startTime: [],

			feeFlag: '',
			feePrice: 0.00,
			tempCycles: '',