|
@@ -235,14 +235,9 @@
|
|
|
</u-popup>
|
|
</u-popup>
|
|
|
<!-- <image :src="poster" style="width: 750rpx;height: 1334rpx;"></image> -->
|
|
<!-- <image :src="poster" style="width: 750rpx;height: 1334rpx;"></image> -->
|
|
|
<!-- 生成图片 -->
|
|
<!-- 生成图片 -->
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
<poster :list="canvasData" background-color="#FFF"
|
|
<poster :list="canvasData" background-color="#FFF"
|
|
|
:width='750' :height='420'
|
|
:width='750' :height='420'
|
|
|
@on-success="posterSuccess" ref="poster" @on-error="posterError"></poster>
|
|
@on-success="posterSuccess" ref="poster" @on-error="posterError"></poster>
|
|
|
-=======
|
|
|
|
|
- <poster :list="canvasData" background-color="#FFF" @on-success="posterSuccess" ref="poster"
|
|
|
|
|
- @on-error="posterError"></poster>
|
|
|
|
|
->>>>>>> 53f9a4ae889bb3cdfdec083420d802cd24b01892
|
|
|
|
|
</view>
|
|
</view>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
高敬炎